flash
course admin manage backup
Merge branch 'master' of https://github.com/zhangBenson/zy

Conflicts:
	WebRoot.war/flash/Student_1.swf
	WebRoot.war/flash/Teacher_1.swf
	WebRoot.war/jsp/www/course/courseAdminManage.jsp
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'remoteProd' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
Merge branch 'master' of https://github.com/zhangBenson/zy
can't find jQuery object etc...