re
fix bug
Merge branch 'slidingmenu' of git://github.com/qii/weiciyuan into slidingmenu

Conflicts:
	weiciyuan.iml