More failed attempt at fade out
Merge branch 'master' of https://github.com/petrock/emeraude

Conflicts:
	app/scripts/main.js