Fixes so portal doesn't break
Fix issue xmpp adapter caused by the keywords
Update change log
Merge branch 'hotfix_0.3.1' into develop