hide some shit
helps to commit all the code
Merge branch 'master' into hide_house_form
yep
Merge branch 'master' into hide_house_form

Conflicts:
	www/assets/js/app.js
Merge branch 'hide_house_form'