local changes
Merge branch 'master' of https://github.com/jivoinm/theBOSS

Conflicts:
	test/client/spec/directives/field.js
calendar changes