Merge branch 'hotfix/0.5.2' into develop
use tag badge in tag index view
lock version of poj_org
organize views and locales
set up action mailer for password recovery
Merge branch 'release/0.5.3'