String 200
Merge branch 'master' of https://github.com/F3j/Canarias-Tour.git

Conflict with String v:
	src/com/canaro/canariasexcursiones/MainActivity.java