Tidy.
Merge branch 'master' of github.com:invertedtomato/ChERP
Merge branch 'master' of github.com:invertedtomato/ChERP
Major update to schema.
Merge branch 'master' of github.com:invertedtomato/ChERP

Conflicts:
	InvertedTomato.ChERP/Areas/People/Models/PersonFamilyViewModel.cs
	InvertedTomato.ChERP/Areas/People/Views/Person/Family.cshtml
	InvertedTomato.ChERP/Areas/People/Views/Person/Summary.cshtml
	InvertedTomato.ChERP/InvertedTomato.ChERP.csproj
	InvertedTomato.ChERP/Models/Model1.edmx
	InvertedTomato.ChERP/Models/ModelAttributes/PeopleMetadata.cs
	InvertedTomato.ChERP/Models/Person.cs
Merge branch 'master' of github.com:invertedtomato/ChERP

Conflicts:
	InvertedTomato.ChERP/InvertedTomato.ChERP.csproj
	InvertedTomato.ChERP/Models/ModelAttributes/PeopleMetadata.cs