Fix #335
Update cep welcome message
Merge branch 'master' of github.com:Heigvd/Wegas

Conflicts:
	wegas-app/src/main/webapp/wegas-resourcemanagement/js/wegas-resourcemanagement-entities.js