Merge.
Merge branch 'master' of github.com:gintas/as24hack

Conflicts:
	bin/classes.dex
	bin/resources.ap_