Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyMsger/bin/MyMsger.apk
	MyMsger/bin/R.txt
	MyMsger/bin/classes.dex
	MyMsger/bin/jarlist.cache
	MyMsger/bin/resources.ap_