Merge remote-tracking branch 'origin/master'

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