Merge branch 'MasterBugFixing' into 'master'
[TRANSLATION] update portal.po
[TRANSLATION] update translation files
merge master
Merge branch 'InnoBugFixing' into 'master'
Merge branch 'master' into 'MasterBugFixing'