Fixing timeline-annotation endpoint path
Merge branch 'dev' of github.com:physion/ovation-api-webservice into annotation-endpoint-macro

Conflicts:
	src/ovation_rest/handler.clj