a
Merge branch 'frontend' of https://github.com/dkellis42/COdeWORK into frontend
Merge branch 'frontend' of https://github.com/dkellis42/COdeWORK into frontend
merge search and sidebar
Merge branch 'frontend' of https://github.com/dkellis42/COdeWORK into frontend

Conflicts:
	public/modules/coffices/controllers/coffice.client.controller.js
	public/modules/coffices/views/templates/coffice-excerpt.client.template.html
	public/modules/coffices/views/templates/coffice-search-result.client.template.html