modify left panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/iory/zhixun/view/EdgeGlow.java