merge fix for STORM-563

doc/contributions.txt

etc/message.xml

indra/cmake/TemplateCheck.cmake

indra/llui/lllineeditor.cpp

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/llfloaterregiondebugconsole.cpp

indra/newview/llfloaterregiondebugconsole.h

indra/newview/llimfloater.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewerregion.cpp

indra/newview/skins/default/colors.xml

...iew/skins/default/xui/en/floater_region_debug_console.xml

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

...wview/skins/default/xui/en/panel_preferences_advanced.xml

...newview/skins/default/xui/en/panel_preferences_colors.xml

scripts/md5check.py