Merge branch 'release/barrett'
Merge branch 'master' of github.com:ImaginationForPeople/imaginationforpeople
remaining ref to old i4pTranslation object
Merge branch 'hotfix/i4p_translation_not_iterable' into develop