prepare for merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes.dex
	bin/classes/.gitignore
	bin/java5775_5366_9373.apk
	bin/resources.ap_