no message
Merge branch 'master' of https://github.com/zeraf29/SimplicScrum

Conflicts:
	SimplicScrum/application/views/project.php