Resolve conflict between simultanious calls
Merge branch 'master' of github.com:Vinnovera/estrad-template