merge changes for storm-937

.hgtags

doc/contributions.txt

indra/cmake/GoogleMock.cmake

indra/cmake/LLAddBuildTest.cmake

indra/llcharacter/llanimationstates.cpp

indra/llcommon/llavatarconstants.h

indra/llcommon/lllslconstants.h

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llcommon/llmemtype.cpp

indra/llcommon/llmetricperformancetester.h

indra/llcommon/llversionviewer.h

indra/llimage/llimageworker.cpp

indra/llimage/llimageworker.h

indra/llmath/llcamera.cpp

indra/llmath/llcamera.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llplugininstance.cpp

indra/llplugin/llplugininstance.h