菜单修改
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/outputFileStates.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	.idea/libraries/android_support_v4.xml
	.idea/libraries/nineoldandroids_library_2_4_0.xml
	.idea/modules.xml
	.idea/workspace.xml
	ResideMenu/build/bundles/release/classes.jar
	ResideMenu/build/libs/ResideMenu.aar
	libViewFlow/libViewFlow.iml
	libViewFlow/libViewflow.iml
	resideMenu/build/bundles/release/classes.jar
	resideMenu/build/libs/resideMenu.aar