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

Conflicts:
	confhermexam/src/fr/conferencehermes/confhermexam/LoginActivity.java