3354: Merge branch 'master' into 3354-render-textile
authorTom Clegg <tom@curoverse.com>
Wed, 27 Aug 2014 00:13:41 +0000 (20:13 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 27 Aug 2014 00:13:41 +0000 (20:13 -0400)
commit34173202861e94dee58ccd5b189983918813d870
treed83ccdf214c8b842526e6c17a4024bcd1e7094c4
parentc28604e8acf4385686c0284d9100263829fed02b
parentff742a82d66bf6b4915d820ec401056323793819
3354: Merge branch 'master' into 3354-render-textile

Conflicts:
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/group.rb
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/arvados_base.rb
apps/workbench/app/models/group.rb
apps/workbench/app/views/application/show.html.erb
apps/workbench/test/integration/projects_test.rb