# Conflicts:
#	build.gradle
#	m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
#	m-dynamic/src/main/java/com/yidianling/dynamic/members/MembersActivity.java
#	m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt