Made QA and normal discussions. Commenting OK.
Merge branch 'master' of https://github.com/pongad/3akai-ux

Conflicts:
	node_modules/oae-core/creatediscussion/js/creatediscussion.js