Merge recent changes

doc/contributions.txt

indra/cmake/00-Common.cmake

indra/develop.py

indra/integration_tests/llui_libtest/llui_libtest.cpp

indra/integration_tests/llui_libtest/llwidgetreg.cpp

indra/integration_tests/llui_libtest/llwidgetreg.h

indra/llcharacter/lljoint.h

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/lldependencies.h

indra/llcommon/lldictionary.h

indra/llcommon/llevents.h

indra/llcommon/llpreprocessor.h

indra/llcommon/llsd.cpp

indra/llcommon/llversionserver.h

indra/llcommon/stdenums.h

indra/llinventory/llinventory.cpp

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/llinventory/llparcel.h