add todo's
set defaultLocale in setUp() method
Merge branch 'master' into maven