changed api
merged with develop
formatted apimock json
cleaned code
Merge branch 'feature/new-api' into develop