Merge pull request #41 from matthewste/master

API Updates
New WebUI setup
Merge branch 'master' of github.com:bwoodworth/Open-Source-Automation

Conflicts:
	OSAE.API/OSAE.API.csproj
	Open Source Automation.sln
New Web UI project
Script Processor updated to reflect API changes.
Merge branch 'master' of https://github.com/bwoodworth/Open-Source-Automation

Conflicts:
	Open Source Automation.sln