Merge

BuildParams

doc/contributions.txt

indra/cmake/FindJsonCpp.cmake

indra/cmake/JsonCpp.cmake

indra/fix-incredibuild.py

indra/llaudio/llaudiodecodemgr.cpp

indra/llcommon/llsdserialize.cpp

indra/llcommon/llstring.h

indra/llimage/llimage.cpp

indra/llrender/llimagegl.cpp

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/llui/lllineeditor.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt