Merge branch 'master' of /home/ridem/AndroidStudioProjects/fr.lemet with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	LeMet/res/layout/plan_reseau.xml
	LeMet/src/fr/lemet/PlanReseau.java
WebView w/ pinch to zoom