Small changes in server part
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/server.js