Merge branch 'master' into 4523-full-text-search

Conflicts:
	services/api/db/structure.sql

diff --cc services/api/app/models/arvados_model.rb
Simple merge

diff --cc services/api/db/structure.sql
index b7d2ea59bbbc7ed1ac06f996e4c22f566487b054,5d9e3e59f37248b6d7edf2034400dc5dc956e57f..362260825566c298c84e17075ea2e0fe61351488
--- 1/services/api/db/structure.sql
--- 2/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2353,6 -2318,4 +2353,6 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20150122175935');
  
 -INSERT INTO schema_migrations (version) VALUES ('20150203180223');
 +INSERT INTO schema_migrations (version) VALUES ('20150123142953');
 +
- INSERT INTO schema_migrations (version) VALUES ('20150203180223');
++INSERT INTO schema_migrations (version) VALUES ('20150203180223');