committing to pull
Merge branch 'master' of https://github.com/invertedtomato/ChERP

Conflicts:
	InvertedTomato.ChErp.DefaultUI/Controllers/PeopleController.cs