zomg
Merge branch 'master' of https://github.com/JamesLefrere/Immo-Hackathon

Conflicts:
	client/views/shortlist.html