cb
Merge branch 'master' of github.com:edse/cmais-frontend
Merge branch 'master' of github.com:edse/cmais-frontend

Conflicts:
	apps/frontend/templates/sites/culturabrasil/sala-de-tvSuccess.php
	web/culturabrasil/controleremoto/css/controleremoto.css
	web/culturabrasil/controleremoto/index.html
	web/culturabrasil/iframe-facebook.html
	web/culturabrasil/iframe-google.html
	web/culturabrasil/iframe-twitter.html
	web/widget/culturabrasil/controleremoto/css/controleremoto.css
	web/widget/culturabrasil/controleremoto/index.html
	web/widget/culturabrasil/iframe-facebook.html
	web/widget/culturabrasil/iframe-google.html
	web/widget/culturabrasil/iframe-twitter.html
	web/widgets/culturabrasil/controleremoto/css/controleremoto.css
	web/widgets/culturabrasil/controleremoto/index.html
	web/widgets/culturabrasil/iframe-facebook.html
	web/widgets/culturabrasil/iframe-google.html
	web/widgets/culturabrasil/iframe-twitter.html