fg
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
	src/com/lzm/Cajas/MapActivity.java