Merge branches 'dev' and 'master' into dev
All endpoints added
Merge branch 'dev'