Fixes for controllers
Merge branch 'master' of https://github.com/BigRomanov/TripPlanner

Conflicts:
	web/public/javascripts/controllers/home.js
	web/public/javascripts/controllers/page.js