Merge pull request #1 from dagilleland/Temp-Dev

Temp dev
Merge pull request #2 from dagilleland/Temp-Dev

Temp dev - Working Version
Merge pull request #3 from dagilleland/Temp-Dev

Accepted Contribution - Cleaned up files, scripts and databases
Clean-up un-needed files
Merge remote-tracking branch 'upstream/Temp-Dev' into Temp-Dev