Merge remote-tracking branch 'origin/master' into weimarnetz-next

* origin/master:
  reserved all known node numbers
  default network: ffweimar
  #fix: remove dev-logging
  add on-demand logging to file
  #cleanup
public: add a minimal website to test the jquery-client
jquery-client: light refactoring before extending
jquery-client: add a 'setup' method to override the default config
jquery-client: add a 'register' method
jquery-client-test: add support for 'setup' and 'register' methods
jquery-client-test: use local version of client
jquery-client: remove comments
README: #fix the URL in walkthrough
dev: add jslint to package and Makefile
lib/register: #lint
app: get network to show on homepage from config
client: sanitze http/https links
app: socket.io: reduce logging
echtzeit.js: #fix socket.io connection (get host from browser and connect there…)
app: fileserver: give correct error if file not found
Merge branch 'refs/heads/jquery-client' into weimarnetz-next

* refs/heads/jquery-client:
  jquery-client: remove comments
  jquery-client-test: use local version of client
  jquery-client-test: add support for 'setup' and 'register' methods
  jquery-client: add a 'register' method
  jquery-client: add a 'setup' method to override the default config
  jquery-client: light refactoring before extending
  public: add a minimal website to test the jquery-client
jquery-client-test: rename
jquery-client-test: better wording about config
jquery-client: cleanup