Visu total nickel
Merge branch 'master' of https://github.com/Aetyno/ProjetSNCFV2.git

Conflicts:
	res/layout/activity_block_note_text.xml