Lilika and mine combined code

EOM
Merge branch 'master' of https://github.com/greenest/BoulderBeta

Conflicts:
	BoulderBeta/bin/BoulderBeta.apk
	BoulderBeta/bin/R.txt
	BoulderBeta/bin/classes.dex
	BoulderBeta/bin/resources.ap_
	BoulderBeta/res/values/strings.xml