some change
Merge branch 'my_diff' of https://github.com/ysopila/DemoApp

Conflicts:
	DemoApp.Web.Angular/Content/Views/Person.html