api routes
Merge branch 'feature/apiStructure' into develop

Conflicts:
	app.js