blabla
Merge branch 'master' of https://github.com/flousse/homazing

Conflicts:
	public/js/move.js