Merge branch 'master' of git@github.com:moksgt/platform.git

Conflicts:
	src/main/webapp/comm-extjs.js
commit.