rails 4 support, better locales support
Merge branch 'develop'
bump version