cleanup
Merge branch 'pr/n57_matthewste'
small update to web and db
Merge branch 'pr/n58_matthewste'
Web UI updates
Update to PS Plugin to allow the use of parameters