merge changes for storm-1634

indra/CMakeLists.txt

indra/newview/installers/windows/installer_template.nsi

indra/newview/llfloatermodelpreview.cpp

indra/newview/llfloatermodelpreview.h

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

indra/newview/skins/default/xui/en/floater_model_preview.xml

indra/test/CMakeLists.txt

indra/test/io.cpp

indra/test/llapp_tut.cpp

indra/test/llevents_tut.cpp

indra/test/llhttpclient_tut.cpp

indra/test/llsd_new_tut.cpp

indra/test/llsdmessagebuilder_tut.cpp

indra/test/lltemplatemessagebuilder_tut.cpp