c
Merge branch 'master' of https://github.com/juhasza/CompanyGroup.ServiceLayers

Conflicts:
	CompanyGroup.WebClient/Scripts/app.carreer.js