Merge branch 'master' into DRTVWR-482

.gitignore

README.md

autobuild.xml

indra/llplugin/llpluginclassmedia.cpp

indra/media_plugins/cef/media_plugin_cef.cpp

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llpanelprimmediacontrols.cpp

indra/newview/llpanelprimmediacontrols.h

indra/newview/lltoolpie.cpp

indra/newview/lltoolpie.h

indra/newview/llviewermedia.cpp

indra/newview/llviewermedia.h

indra/newview/llviewermediafocus.cpp

indra/newview/llviewermediafocus.h

indra/newview/llviewerparcelmedia.cpp

indra/newview/viewer_manifest.py