last commit of the day
Merge branch 'master' of https://github.com/morengab/project-orangina

Conflicts:
	app/js/controllers.js