Merge branch 'dev' of https://github.com/bropines/BallonsTranslator into dev