M:something that i don't know.
Merge branch 'master' of https://github.com/littlerhub/android.git

Conflicts:
	BianmiApp/res/layout/details_listview_item_comment.xml
	BianmiApp/res/layout/details_listview_item_secret.xml