Added tenancy.
Improved context handling.
Merge branch 'master' of github.com:invertedtomato/ChERP

Conflicts:
	InvertedTomato.ChERP/Models/Model.edmx.diagram