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

Conflicts:
	apps/frontend/templates/sites/cocorico2/clipes-musicaisSuccess.php
Merge branch 'master' of github.com:edse/cmais-frontend
update
up
up
Merge branch 'master' of github.com:edse/cmais-frontend
Merge branch 'master' of github.com:edse/cmais-frontend