STORM-1019 Resolve merge conflicts

.hgtags

BuildParams

doc/contributions.txt

indra/CMakeLists.txt

indra/cmake/FindLLQtWebkit.cmake

indra/linux_updater/linux_updater.cpp

indra/llcommon/llavatarname.cpp

indra/llcommon/llprocesslauncher.cpp

indra/llcommon/llversionviewer.h

indra/llinventory/llparcel.cpp

indra/llinventory/llparcel.h

indra/llmath/v3math.h

indra/llmessage/tests/llhost_test.cpp

indra/llplugin/llpluginprocessparent.cpp

indra/llprimitive/lltextureentry.cpp

indra/llrender/llvertexbuffer.cpp

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/llui/lldockcontrol.cpp

indra/llui/llfloater.cpp