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

Conflicts:
	SimplicScrum/application/views/project.php