Merge

doc/contributions.txt

indra/llui/CMakeLists.txt

indra/llui/llaccordionctrltab.cpp

indra/llui/llflatlistview.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llresizebar.cpp

indra/llui/lltextutil.cpp

indra/llui/lltextutil.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/CA.pem

indra/newview/app_settings/settings.xml

indra/newview/character/avatar_lad.xml

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llavatarlist.cpp