Merge branch 'slidingmenu' of https://github.com/qii/weiciyuan into qii-slidingmenu

Conflicts:
	libs/google-play-services_lib/project.properties
test
Merge branch 'qii-slidingmenu' into slidingmenu