Fix typo in discussion activity i18n
Merge branch 'activityTypo' of https://github.com/bp323/3akai-ux into activityTypo
Merge remote-tracking branch 'origin/master' into termsandcond
Hook the terms and conditions widget into the register widget