Merge branch 'hotfix/fix_zh_locale'
Merge remote-tracking branch 'upstream/master'
fixed a remaining direct ref to i4pTranslation no longer working with hvad
Merge branch 'hotfix/project_translation_not_iterable' into develop
Merge branch 'develop' of https://github.com/ImaginationForPeople/imaginationforpeople into develop