Merge testing

includes:

  - new web interface
  - new config
  - deployment