update
update
update
Merge branch 'master' of https://github.com/ibalintha/ccloudedu

Conflicts:
	WebRoot/WEB-INF/jsp/system/layout/layoutCh.jsp