master
Merge branch 'yqf-dev'

Conflicts:
	.gradle/1.9/taskArtifacts/cache.properties.lock
	.gradle/1.9/taskArtifacts/fileHashes.bin
	.gradle/1.9/taskArtifacts/fileSnapshots.bin
	.gradle/1.9/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	app/build/libs/app-debug.ap_