Plannif again
Again
again again
AGAIN
Merge branch 'master' of https://github.com/ITKWeb/menottes

Conflicts:
	public/javascripts/controllers/PlanifController.js
	public/javascripts/services/network.js
	public/stylesheets/planif.css
	public/views/addNewProject.html
	public/views/login.html
	public/views/planif.html