employee model, fix a reference error cb-->callback
google login fixed (only for development env)

several fixes for hier and user model
Merge branch 'master' of https://github.com/Exartu/Exartu-CRM

Conflicts:
	client/js/directives/directives.js
	server/models/contactable.js
	server/routes/contactables.js