Merge branch 'master' of https://github.com/nielse63/SBC

* 'master' of https://github.com/nielse63/SBC:
  Final pulldown from staging server.
  All latest changes.