Merge pull request #2 from balticit/master

master -> stage
Merge branch 'stage' of github.com:balticit/template
fix localization
update active admin