Upload de cours
Téléchargement de cours
Merge branch 'development' of http://github.com/ragulan77/athena into development

Conflicts:
	.gitignore
	app/AppKernel.php
	app/config/routing.yml
ajout de la suppression de cours
creation classe, ajout d etudiant/prof/matiere par classe
Merge branch 'development' of http://github.com/ragulan77/athena into development

Conflicts:
	app/AppKernel.php
	app/Resources/views/base.html.twig
	composer.lock
	src/Ath/UserBundle/Entity/Professor.php
	src/Ath/UserBundle/Resources/config/routing.yml
	src/Ath/UserBundle/Resources/views/Registration/student.form.html.twig
	web/js/bootstrap.js
student mis a jour
student mis a jour + bundle a jour
Administrator corrige + config.yml corrige
 Please enter the commit message for your changes. Lines starting
Merge pull request #1 from Kuro456/development

Development