change the css and fix the template
Merge branch 'master' of

Conflicts:
	AngularJSDemo/Views/Home/Index.cshtml