Merge branch 'master' into 2051-nondeterministic-jobs

Conflicts:
	doc/README
	doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid

diff --cc apps/workbench/doc/README_FOR_APP
index fe41f5cc24d667635c46a533fd09bf7bb514e032,fe41f5cc24d667635c46a533fd09bf7bb514e032..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/apps/workbench/doc/README_FOR_APP
--- 2/apps/workbench/doc/README_FOR_APP
+++ /dev/null
@@@ -1,2 -1,2 +1,0 @@@
--Use this README file to introduce your application and point to useful places in the API for learning more.
--Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

diff --cc doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
index a4bad5820d360ee1bf0a4328dfc69e0cacebafab,d218c3b9a4f2b44f34fa2446f53533964b89c4e9..132bc9d700d27f6525d03cb28642f76bfd48bbaa
--- 1/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
--- 2/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
+++ b/doc/user/tutorials/tutorial-new-pipeline.html.textile.liquid
@@@ -71,5 -69,5 +71,4 @@@ Now, use @arv pipeline_template create
  </code></pre>
  </notextile>
  
 -Your new pipeline template will appear on the "Workbench %(rarr)&rarr;% Compute %(rarr)&rarr;% Pipeline&nbsp;templates":http://{{ site.arvados_workbench_host }}/pipeline_templates page.
 -
 +Your new pipeline template will appear on the "Workbench %(rarr)&rarr;% Compute %(rarr)&rarr;% Pipeline&nbsp;templates":https://{{ site.arvados_workbench_host }}/pipeline_instances page.
- 

diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
Simple merge