fix crash server
Merge branch 'develop' of github.com:softwareplanet/automizely into develop
Merge branch 'develop'