Updated string, new description for 1.1
Update for 1.1
Updated mail address in options activity
Updated manifest
Git shit
More git shit..
Fixed  bug for last version
Updated for version 1.2, new maps & shared shit
damn it git...
Fixed some changes
Fixed conflicts
Merge remote-tracking branch 'origin/Tom'

Conflicts:
	IceCaveProject/assets/12265-126-234-9011694944469-79-7824-104-114/107
	IceCaveProject/bin/IceCave.apk
	IceCaveProject/bin/classes.dex
	IceCaveProject/bin/dexedLibs/icecavelibrary-514c52e647d17e6797716c475fb3150d.jar
	IceCaveProject/bin/resources.ap_