Merge branch 'master' of github.com:noflo/noflo-webserver

Conflicts:
	components/Server.coffee