add filtering by office
Merge branch 'master' of https://github.com/warash/muppetshow

Conflicts:
	app/scripts/projects/projects.html
	app/scripts/projects/projects_ctrl.coffee