Clean slate
Merge branch 'service-api' of github.com:thomastuts/artedex-service into service-api