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

Conflicts:
	confhermexam/res/layout/activity_notes.xml
	confhermexam/res/layout/exersice_rowview.xml
	confhermexam/src/fr/conferencehermes/confhermexam/NotesActivity.java
	confhermexam/src/fr/conferencehermes/confhermexam/adapters/ExerciseAdapter.java