add department js
Merge branch 'master' of ssh://git@github.com/chinacloud/mic.git

Conflicts:
	oa/WebContent/WEB-INF/views/organiza/adddepartment.jsp
add ckeditor
add ckeditor java connector dependency
merge
merge
merge