Merge pull request #1 from edgabaldi/master

merge edgabald change
Configuring Internationalization and adding template tag translates
Merge pull request #5 from fbsbittencourt/master

Configuring Internationalization and adding template tag translates