migrations and admin panel updates
Merge branch 'master' into develop
Update README.md