Now we have breakable
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_
Merge remote-tracking branch 'origin/master' into SagieBranch

Conflicts:
	IceCaveProject/bin/dexedLibs/GoogleAdMobAdsSdk-6.4.1-ce2c4d06da7a1ef6db23684c39031be2.jar
	IceCaveProject/bin/dexedLibs/android-support-v4-4e50ce2661fbac266c9316fa7b7ade52.jar