btn trajet
ajout page trajet
Merge branch 'master' of https://github.com/remysanfeliu/Travelr

Conflicts:
	res/layout/activity_main.xml
	res/layout/trav_activity.xml
	res/values/strings.xml
	src/icam/Travelr/Core/MainActivity.java
	src/icam/Travelr/Core/TravActivity.java