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

Conflicts:
	confhermexam/res/layout/activity_telechargement.xml