Merge branch 'develop'
Merge branch 'master' of github.com:softwareplanet/automizely
Merge remote-tracking branch 'origin'