Merge remote-tracking branch 'remotes/origin/master' into TouchUI

Conflicts:
	server.js