Perhaps the final changes to localization.
Merge branch 'localization' of https://github.com/MinionApp/minion.git into localization