Pull for my changes to date

Stéphane , This accounts for the progress to date

I thought it was time to merge something back up to your code base, or at least start the discussion on it as I'm getting close to producing something I'll be using.

Changes include:
significant expansion of /dedicated/server
significant parts of /ip
rudimentary /dedicated/nasha
rudimentary /licence/*

For the most part, all are running.  I believe I have commented where I've written something but left it untested.