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

Conflicts:
	confhermexam/res/drawable-xhdpi/ic_camera.png
	confhermexam/res/drawable-xhdpi/ic_note.png
	confhermexam/res/drawable-xhdpi/ic_resultat.png
	confhermexam/res/drawable-xhdpi/ic_sound.png
	confhermexam/res/drawable-xhdpi/ic_video.png
	confhermexam/res/layout/activity_question_response.xml
	confhermexam/res/layout/downloads_rowview.xml
	confhermexam/res/layout/resultat_rowview.xml
	confhermexam/src/fr/conferencehermes/confhermexam/QuestionResponseActivity.java
	confhermexam/src/fr/conferencehermes/confhermexam/fragments/MyProfileFragment.java