cucumber acceptance tests
Merge branch 'integration' of https://github.com/60frames/api-server into integration
Merge commit 'ae3868e2774f918a920f3e218378af666f612895' into HEAD