cleanup
Merge branch 'dev' of github.com:antipetrov/timerwood_server into dev

* 'dev' of github.com:antipetrov/timerwood_server:
  cleanup
cors headers