revert
Merge branch 'dev' of github.com:drewrobinson/grcs-zf2 into dev

Conflicts:
	public/scripts/services/calendar-service.js