merge changes for storm-714

doc/contributions.txt

indra/llimage/CMakeLists.txt

indra/llimage/tests/llimageworker_test.cpp

indra/llimagej2coj/llimagej2coj.cpp

indra/llimagej2coj/llimagej2coj.h

indra/llkdu/CMakeLists.txt

indra/llkdu/llimagej2ckdu.cpp

indra/llkdu/llimagej2ckdu.h

indra/llkdu/tests/llimagej2ckdu_test.cpp

indra/llmath/tests/m3math_test.cpp

indra/llui/llfloater.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/app_settings/shaders/shader_hierarchy.txt

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/llfloatermap.cpp

indra/newview/llimfloater.cpp