Add initial version of seed data for Condition, Cohort, ActivitySchema; add migration to add questions field to ActivitySchema; set up ActivitySchema model with has_many_inline for questions; set up attr_accessible for several models to allow seeding
Merge pull request #1 from ucberkeley/features/RH/SW-scaffold

Features/rh/sw scaffold
Created basic waiting_room model, spec file, and migration
added WaitingList ref to task.rb, rearranged code and rdoc for better readability
Fixed syntax error in migration, committing new schema
Added factory and sanity-check spec for WaitingRoom
Merge pull request #3 from ucberkeley/features/DCC/seed-remaining-models

Add initial version of seed data for Condition, Cohort, ActivitySchema; ...
Basic specs for adding a task to waiting room and making sure no
duplicate tasks in waiting room
Added user state field to task and code + specs for managing it via
params['u'], which should unmarshal to a hash
Setup @submit_to view variable for form path
moved task routing specs to spec/routing/
moved developer-facing README into doc/README_FOR_APP.md and made the toplevel README.md researcher-facing.  From now on please add developer-specific info to doc/README_FOR_APP.md.
moved developer-facing README into doc/README_FOR_APP.md and made the toplevel README.md researcher-facing.  From now on please add developer-specific info to doc/README_FOR_APP.md.
added chat feature
Gemfile now contains 'gem capybara'
rebased with Armando, then added a heroku deploy debug tip and a few instructions for running the app locally to doc/README_FOR_APP.md
set chatpage.js.erb to run after chatpage finished loading
moved chat form to a partial
updated chat_backend.rb to support multiple chat pages and tweaked chatpage.js.erb to make path name adaptable also added test view
Added preferred & minimum group size to Condition, including
validations, specs, and changes to scaffolded
views/conditions/_form.html.erb partial.
Changed Condition factory to specify group sizes, since required for validity.
added condition spec