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

Conflicts:
	confhermexam/res/layout/downloads_rowview.xml
	confhermexam/src/fr/conferencehermes/confhermexam/CorrectionActivity.java
Merge branch 'master' of https://github.com/aram-hakobyan/confherm
part of Corrections