Automated merge up from viewer-development

build.sh

doc/contributions.txt

indra/cmake/00-Common.cmake

indra/cmake/BerkeleyDB.cmake

indra/cmake/CMakeLists.txt

indra/cmake/FindJsonCpp.cmake

indra/cmake/FindLLQtWebkit.cmake

indra/cmake/FindNDOF.cmake

indra/cmake/FindZLIB.cmake

indra/cmake/LLAddBuildTest.cmake

indra/cmake/LLCommon.cmake

indra/cmake/LLPlugin.cmake

indra/cmake/NDOF.cmake

indra/cmake/WebKitLibPlugin.cmake

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

indra/llcommon/llapr.cpp

indra/llcommon/llapr.h

indra/llcommon/llevents.cpp

indra/llplugin/CMakeLists.txt

indra/llplugin/llpluginclassmedia.cpp