Fix broken regex
Merge branch 'master' of https://github.com/ackushiw/staffit

Conflicts:
	app/scripts/controllers/main.js
Merge changes