Merge branch 'master' of http://git.zjseek.com.cn/dancing/dancing-android-app

Conflicts:
	.idea/inspectionProfiles/Project_Default.xml
	app/app.iml