Upgrade to version 23 and fix warnings & errors#2

marcboule98 wants to merge 2 commits intomainIOC/portafolis:mainfrom

mahara-upgrade-version23-fix-weIOC/portafolis:mahara-upgrade-version23-fix-weCopy head branch name to clipboard