synceeeennn
Merge branch 'master' of https://github.com/A-StadLabs/citylive

Conflicts:
	app/elements/cl-stage/cl-stage.html