closed incident
Merge branch 'master' of https://github.com/ferrufino/Incidents

Conflicts:
	project/templates/project/manager.html