new changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	routes/api.js