turn off error handler by default
fix rouge close tags
fix rouge close tags
fix rouge close tags
Merge remote-tracking branch 'upstream/master' into RELEASE-staging
Fix for IPhone Videos
Merge remote-tracking branch 'upstream/master' into RELEASE-STAGING
Merge remote-tracking branch 'upstream/staging' into RELEASE-PRODUCTION

Conflicts:
	RcmBrightcovePlayer/public/rcm-brightcove-player.js
Merge remote-tracking branch 'upstream/master' into RELEASE-staging
Merge remote-tracking branch 'upstream/staging' into RELEASE-staging
Merge remote-tracking branch 'upstream/production' into RELEASE-production
Merge remote-tracking branch 'upstream/master' into RELEASE-production

Conflicts:
	RcmErrorHandler/config/module.config.php
Merge remote-tracking branch 'upstream/master' into RELEASE
Merge remote-tracking branch 'upstream/master' into RELEASE
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/staging' into uno