Merge pull request #5 from marc-portier/master

Merging parallel work by Karel and me
Merge pull request #6 from marc-portier/master

conf.id no longer matches the port number
Merge pull request #7 from marc-portier/master

update
Merge remote-tracking branch 'mpo/master'
Implemented misc manager bits, introduced the manager webui