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

Conflicts:
	app/js/house/app.js
	app/login.html
Fixed Merging conflicts
Interaction changes

I have implemented the ngRoute for navigation between the login and the
main page, fix some issues with the getting the data from the json file.
Need more modification to be fully functional.
Routing

Modifications on the routing.
Minor changes

Added routing specific css files to a template.
Minor changes in layout design

Changes in the login page of the app.