Modifying QCM
Add HighScore 
Add Account activated
Indenting
Changed SQL Query to Hibernate query
Changed SQL Query to Hibernate query
Changed SQL Query to Hibernate query
Changed SQL Query to Hibernate query
Random QCM avec id disjoints
IDEM pour piano
Random QCM avec id disjoints
IDEM pour piano
Merge origin/Mathias2

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/dao/QuestionDaoImpl.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/java/com/service/QuestionService.java
	src/main/java/com/service/QuestionServiceImpl.java
	src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias2

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/dao/QuestionDaoImpl.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/java/com/service/QuestionService.java
	src/main/java/com/service/QuestionServiceImpl.java
	src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias2

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/dao/QuestionDaoImpl.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/java/com/service/QuestionService.java
	src/main/java/com/service/QuestionServiceImpl.java
	src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias2

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/dao/QuestionDaoImpl.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/java/com/service/QuestionService.java
	src/main/java/com/service/QuestionServiceImpl.java
	src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias2

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/dao/QuestionDaoImpl.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/java/com/service/QuestionService.java
	src/main/java/com/service/QuestionServiceImpl.java
	src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias2

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/dao/QuestionDaoImpl.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/java/com/service/QuestionService.java
	src/main/java/com/service/QuestionServiceImpl.java
	src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias3

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias3

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias3

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias3

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp
Merge origin/Mathias3

Conflicts:
	src/main/java/com/dao/KeyboardDaoImpl.java
	src/main/java/com/dao/QuestionDao.java
	src/main/java/com/service/KeyboardServiceImpl.java
	src/main/webapp/WEB-INF/jsp/user/games/qcm.jsp