fd
Merge branch 'master' of https://github.com/xiehuier/xiehuier.git

Conflicts:
	bin/AndroidManifest.xml
d