Lovely search thing!
Merge branch 'master' of github.com:invertedtomato/ChERP-TT3

Conflicts:
	InvertedTomato.ChERP/Areas/People/Controllers/CollectionController.cs
	InvertedTomato.ChERP/Areas/People/Views/Collection/Index.cshtml
Switched to using unique viewmodel
Merge branch 'master' of github.com:invertedtomato/ChERP-TT3