merge
merge
Merge branch 'slidingmenu' of git://github.com/qii/weiciyuan into slidingmenu
Merge branch 'slidingmenu' of git://github.com/qii/weiciyuan into slidingmenu
Merge branch 'slidingmenu' of git://github.com/qii/weiciyuan into slidingmenu
Merge branch 'slidingmenu' of git://github.com/qii/weiciyuan into slidingmenu
fix crash
Merge branch 'slidingmenu' of https://github.com/Jewelzqiu/weiciyuan into slidingmenu

Conflicts:
	.idea/libraries/libs.xml
	AndroidManifest.xml
	libs/google-play-services_lib/google-play-services_lib.iml
	libs/slidingmenulibrary/slidingmenulibrary.iml
	weiciyuan.iml
fix