conficts fix after merge
Merge branch 'develop' of https://github.com/Podobri/Podobri into develop
create Db script edited (added columns in user)