Minor Modifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/house/app.js
	app/login.html