Merge branch 'master' into 3637-copy-selections
authorradhika <radhika@curoverse.com>
Tue, 2 Sep 2014 18:43:15 +0000 (14:43 -0400)
committerradhika <radhika@curoverse.com>
Tue, 2 Sep 2014 18:43:15 +0000 (14:43 -0400)
commit0e0279e2566ff5ee19a741961dd21b3e2ab310db
tree213da92fe10303f417e3e73ab85fc6f256c40bd7
parentc23cb2dd9b373a8e391e810a9406114749cc2c59
parent5b953c11c79e63cbbe0a08037c429f3f7ed0ff13
Merge branch 'master' into 3637-copy-selections

Conflicts:
apps/workbench/app/views/application/_choose.js.erb
apps/workbench/config/routes.rb
apps/workbench/app/assets/javascripts/selection.js
apps/workbench/app/views/application/_choose.js.erb
apps/workbench/app/views/projects/_show_tab_contents.html.erb