Fixtures
conflicts
Merge branch 'master' of https://github.com/perehn/umob.git

Conflicts:
	common/basemodel.js
	site/models/fixtures/companyfixture.js
	site/models/fixtures/employeefixture.js