modal
ghghgh
Merge branch 'master' of https://github.com/timomayer/sirstaffalot

Conflicts:
	public/app/controllers/staffingCtrl.js
	public/sirstaffalot.html