Merge pull request #19 from draganglumac/master

Device id in the jobs table.
Update machines.csv
added stored proc for retrieving any jobs in progress on a machine
Added templates table.