render toolbar
fixed conflict in routes
Merge branch 'master' of github.com:aserafin/poligloto