deadline revised
Merge branch 'master' of https://github.com/wilbros/QCPM

Conflicts:
	src/Compnet/QcBundle/Controller/ProjectController.php