Show server log on client
Merge remote-tracking branch 'origin/master'

Conflicts:
	backend.js
	communication.js