prepare deployment
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/backend/backend.js
nice error message