Merge branch 'master', remote branch 'origin/master'
Sat Aug 17 08:58:50 MDT 2013

Database:
  Schema:
    Tables:
      cors: Added new 'cors' table to handle CORS requests.
    Views:
      viewInventoryComputers: Added 'id' field as part of return.
      viewInventoryMonitors: Added 'id' field as part of return.