je sais pas
Merge branch 'master' of https://github.com/remysanfeliu/travelr

Conflicts:
	src/icam/Travelr/Core/MainActivity.java
head supr