ghjghj
Merge remote-tracking branch 'origin/master'

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