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

Conflicts:
	res/drawable/style_shape_back_button.xml