Merge
Merge branch 'mikael' of https://github.com/miko91/myLearn into mikael

Conflicts:
	SQL/mylearn.sql
	www/Applications/Admin/AdminApplication.class.php
	www/Applications/Admin/Modules/Classe/ClasseController.class.php
	www/Applications/Admin/Modules/Dashboard/DashboardController.class.php
	www/Applications/Admin/Modules/Dashboard/Views/index.php
	www/Applications/Admin/Modules/Eleve/EleveController.class.php
	www/Applications/Admin/Modules/Eleve/Views/ajout.php
	www/Applications/Admin/Modules/Eleve/Views/modif.php
	www/Applications/Admin/Modules/Matiere/MatiereController.class.php
	www/Applications/Admin/Modules/Matiere/Views/index.php
	www/Applications/Admin/Modules/Param/ParamController.class.php
	www/Applications/Admin/Modules/Param/Views/index.php

www/Applications/Admin/Modules/Professeur/ProfesseurController.class.php
	www/Applications/Admin/Modules/Professeur/Views/ajout.php
	www/Applications/Admin/Modules/Professeur/Views/modif.php
	www/Applications/Admin/Modules/Section/SectionController.class.php
	www/Applications/Admin/Modules/Session/SessionController.class.php
	www/Applications/Admin/Templates/layout.php
	www/Applications/Admin/config/app.xml
	www/Applications/Admin/config/routes.xml
	www/Applications/Frontend/Config/app.xml
	www/Applications/Frontend/Config/routes.xml
	www/Applications/Frontend/FrontendApplication.class.php

www/Applications/Frontend/Modules/Connexion/ConnexionController.class.ph
p
	www/Applications/Frontend/Modules/Connexion/Views/activate.php
	www/Applications/Frontend/Modules/Connexion/Views/index.php
	www/Applications/Frontend/Modules/Connexion/Views/newPass.php
	www/Applications/Frontend/Modules/Connexion/Views/passReload.php
	www/Applications/Frontend/Modules/Cours/CoursController.class.php
	www/Applications/Frontend/Modules/Cours/Views/ecrire.php
	www/Applications/Frontend/Modules/Cours/Views/list_classe.php
	www/Applications/Frontend/Modules/Cours/Views/list_cours.php
	www/Applications/Frontend/Modules/Cours/Views/list_matiere.php
	www/Applications/Frontend/Modules/Cours/Views/modifier.php
	www/Applications/Frontend/Modules/Cours/Views/show.php
	www/Applications/Frontend/Modules/Cours/Views/sidebar.php
	www/Applications/Frontend/Modules/Membre/MembreController.class.php
	www/Applications/Frontend/Modules/Membre/Views/index.php
	www/Applications/Frontend/Modules/Membre/Views/maConfiguration.php
	www/Applications/Frontend/Modules/Membre/Views/mesCours.php
	www/Applications/Frontend/Modules/Membre/Views/modifierProfil.php
	www/Applications/Frontend/Templates/layout.php
	www/Applications/Frontend/Templates/nolayout.php
	www/Applications/Install/Config/app.xml
	www/Applications/Install/Config/routes.xml
	www/Applications/Install/InstallApplication.class.php

www/Applications/Install/Modules/Installation/InstallationController.cla
ss.php
	www/Applications/Install/Modules/Installation/Views/init1.php
	www/Applications/Install/Modules/Installation/Views/init2.php
	www/Applications/Install/Modules/Installation/Views/init3.php
	www/Applications/Install/Modules/Installation/Views/init4.php
	www/Applications/Install/Modules/Installation/mylearn.sql
	www/Applications/Json/Config/routes.xml
	www/Applications/Json/JsonApplication.class.php
	www/Applications/Json/Modules/Connexion/ConnexionController.class.php
	www/Applications/Prof/Config/app.xml
	www/Applications/Prof/Config/routes.xml
	www/Applications/Prof/Modules/Dashboard/DashboardController.class.php
	www/Applications/Prof/ProfApplication.class.php
	www/Applications/Prof/Templates/layout.php
	www/Library/Application.class.php
	www/Library/BackController.class.php
	www/Library/Config.class.php
	www/Library/Entities/Classe.class.php
	www/Library/Entities/Comment.class.php
	www/Library/Entities/Cours.class.php
	www/Library/Entities/Matiere.class.php
	www/Library/Entities/User.class.php
	www/Library/HTTPResponse.class.php
	www/Library/Keygen.class.php
	www/Library/Mailer.class.php
	www/Library/Models/AdministrateurManager_PDO.class.php
	www/Library/Models/ClasseManager_PDO.class.php
	www/Library/Models/CommentsManager_PDO.class.php
	www/Library/Models/CoursManager.class.php
	www/Library/Models/CoursManager_PDO.class.php
	www/Library/Models/EleveManager.class.php
	www/Library/Models/EleveManager_PDO.class.php
	www/Library/Models/MatiereManager.class.php
	www/Library/Models/MatiereManager_PDO.class.php
	www/Library/Models/ProfesseurManager.class.php
	www/Library/Models/ProfesseurManager_PDO.class.php
	www/Library/Models/SectionManager_PDO.class.php
	www/Library/Models/SessionManager_PDO.class.php
	www/Library/Models/UserManager_PDO.class.php
	www/Library/PDOFactory.class.php
	www/Library/Page.class.php
	www/Library/Router.class.php
	www/Library/User.class.php
	www/Web/admin.php
	www/Web/assets/js/custom.js
	www/Web/css/bootstrap.css
	www/Web/frontend.php
	www/Web/js/custom.js
	www/Web/js/dataTables/dataTables.bootstrap.js
	www/Web/js/dataTables/jquery.dataTables.js
	www/Web/json.php
	www/Web/prof.php