merger
Merge branch 'master' of https://github.com/aram-hakobyan/confherm

Conflicts:
	confhermexam/src/fr/conferencehermes/confhermexam/adapters/DownloadsAdapter.java
Merge branch 'master' of https://github.com/aram-hakobyan/confherm
com
Merge

Conflicts:
	confhermexam/src/fr/conferencehermes/confhermexam/CorrectionActivity.java
	confhermexam/src/fr/conferencehermes/confhermexam/adapters/DownloadsAdapter.java