commit 13_06
Merge branch 'master' of https://github.com/remysanfeliu/TravelrMvnExperiment

Conflicts:
	AndroidManifest.xml