Tidy.
Tidy.
Prepare for ModuleImport tidy.
Merge branch 'master' of github.com:invertedtomato/ChERP-TT3

Conflicts:
	InvertedTomato.ChERP/Areas/People/Controllers/PeopleController.cs