Some changes to show demo.
Merge branch 'master' of https://github.com/ParetoLabs/Dealem.ma

Conflicts:
	app/views/demo.html