reverts the merge of localization because it broke things. Something with ActivityType
readds all of the localization stuff, sorry
fix typo
Merge branch 'dev-gradle' into reports