修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	ResideMenu/src/com/special/ResideMenu/ResideMenu.java
	ResideMenuDemo/res/layout/main.xml
	ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java
	settings.gradle