New version
Merge branch 'master' of https://github.com/virt2real/admin_panel