laucher
Merge branch 'master' of https://github.com/remysanfeliu/travelr

Conflicts:
	AndroidManifest.xml