.....
Merge branch 'master' of https://github.com/tomochandv/Happy

Conflicts:
	Happy.Mis/Controllers/HomeController.cs