Merge branch 'master' into 3586-job-priority

Conflicts:
	services/api/db/structure.sql

diff --cc services/api/db/structure.sql
index 55a93f31406cd373a5c53be87fd613e8e7816119,8fb3416bccb1052ee5e49da86e2d12782c28910d..bd86826f3859c52ae39a7fcc939dd8033df540f6
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -427,10 -428,7 +427,8 @@@ CREATE TABLE jobs 
      nondeterministic boolean,
      repository character varying(255),
      supplied_script_version character varying(255),
 -    docker_image_locator character varying(255)
 +    docker_image_locator character varying(255),
-     name character varying(255),
-     description text,
 +    priority integer DEFAULT 0 NOT NULL
  );
  
  
@@@ -2019,5 -2010,3 +2010,5 @@@ INSERT INTO schema_migrations (version
  INSERT INTO schema_migrations (version) VALUES ('20140818125735');
  
  INSERT INTO schema_migrations (version) VALUES ('20140826180337');
- INSERT INTO schema_migrations (version) VALUES ('20140828141043');
 +
++INSERT INTO schema_migrations (version) VALUES ('20140828141043');