a bug on the org information editing page
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot.war/jsp/www/layout/top.jsp
Merge branch 'master' of https://github.com/zhangBenson/zy
teacher management function
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebRoot.war/flash/Teacher_1.swf