Pouet pouet !
Merge branch 'master' of https://github.com/Tienoss/Planning

Conflicts:
	Planning/beans/course.cpp
	Planning/beans/course.h
	Planning/main.h
	Planning/projet_planning.pro.user