aide occurrence
Merge branch 'master' of https://github.com/melecoq/client--gbiffrance-portal

Conflicts:
	app/scripts/controller/controllers_occurrence.js