modify mix-android
Merge branch 'master' of https://github.com/colddew/mix-android

Conflicts:
	.gitignore
	README.md