merge

indra/llcommon/llsd.cpp

indra/llcommon/llsd.h

indra/llmessage/llareslistener.cpp

indra/llui/llflatlistview.cpp

indra/llui/llfloaterreglistener.cpp

indra/llui/llnotifications.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llchathistory.cpp

indra/newview/lleventnotifier.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloatertestinspectors.cpp

indra/newview/llgroupactions.cpp

indra/newview/llgrouplist.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/lllocationinputctrl.cpp

indra/newview/llmaniptranslate.cpp

indra/newview/llnavigationbar.cpp