bljkljol
Merge branch 'master' into alex

Conflicts:
	src/ProjectMgmt/Bundle/Entity/User.php~
Merge branch 'master' into alex

Conflicts:
	src/ProjectMgmt/Bundle/Entity/Chapter.php~
[DISPLAY]
Merge branch 'master' of github.com:alex-ception/project-mgmt

Conflicts:
	src/ProjectMgmt/Bundle/Entity/Chapter.php~