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' of github.com:slash-slash-no-comment-WPI-cs3733/wpi-suite into filter_with_search