Use new location of i18n keys
Reverted back to `ACTIVITY_` keys
Only load properties from the bundles directory
Merge pull request #933 from nicolaasmatthijs/emailI18N

Email i18n improvements