OOXX:I don't know what happened.
Merge branch 'master' of https://github.com/littlerhub/android.git

Conflicts:
	BianmiApp/res/layout/activity_settings.xml