Merge branch 'hotfix/deletecreationfix'
Fixed Firsttime bug
Merge branch 'hotfix/firsttime' into develop