backgrounds
Merge branch 'master' of github.com:lucafaggianelli/Crezy

Conflicts:
	server/static/presentations/2.json
login, newyork