Merge remote-tracking branch 'origin/master'

Conflicts:
	Outfitr/bin/Outfitr.apk
	Outfitr/bin/classes.dex