merge changes for storm-485

doc/contributions.txt

indra/lib/python/indra/util/test_win32_manifest.py

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/llui/llfloater.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/app_settings/shaders/shader_hierarchy.txt

indra/newview/llfloatermap.cpp

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llinventorybridge.cpp

indra/newview/llpanelmaininventory.cpp

indra/newview/llscreenchannel.cpp