fix org back end get wrong org.
add new course type.
Merge remote-tracking branch 'origin/master' into nnmaster

Conflicts:
	WebRoot.war/jsp/gogowise/course/courseMaintenance.jsp