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

Conflicts:
	web/portal/js/cocorico.js
fsdfsdf
sdafsdf
sd