minor changes
Merge branch 'master' of https://github.com/SoftServeUniversity/WEBUI-092
removed some migrations to fix BUG
fixed conflict