* Translation
Merge branch 'master' of github.com:devilry/devilry-django