Merge branch 'thomas' of https://github.com/Mugiwaranojo/QCMPlus into mugiwara

Conflicts:
	QCMPlusAdmin/app/src/main/java/thomascorfield/fr/qcmplusadmin/Controllers/LoginActivity.java
	QCMPlusAdmin/app/src/main/java/thomascorfield/fr/qcmplusadmin/Controllers/MCQListActivity.java
	QCMPlusAdmin/app/src/main/java/thomascorfield/fr/qcmplusadmin/Controllers/UserListActivity.java
	QCMPlusAdmin/app/src/main/res/layout/activity_mcq_list.xml
	QCMPlusAdmin/app/src/main/res/layout/activity_user_list.xml
	QCMPlusAdmin/app/src/main/res/layout/layout_list_cell.xml
	QCMPlusAdmin/app/src/main/res/layout/mcq_list_cell.xml
Merge branch 'thomas' of https://github.com/Mugiwaranojo/QCMPlus into mugiwara