sasas
Merge branch 'master' of github.com:amolc/housingadmin

Conflicts:
	www/templates/login.html
sdfdsf
Merge branch 'master' of github.com:amolc/housingadmin
cont