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 #3 from ucberkeley/features/DCC/seed-remaining-models

Add initial version of seed data for Condition, Cohort, ActivitySchema; ...
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.
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
Merge pull request #5 from p-tricky/chat_feature

Chat feature
locked rspec to 2.x, enabled per-branch dev and test databases
latest schema.rb
documented new @chat_group template field in README
initial model and specs for WaitingRoom
Merge branch 'feature/AF-group'

Lots of manual conflicts that were small but touched same pieces of files...
	Gemfile
	Gemfile.lock
	README.md
	app/models/activity_schema.rb
	app/models/condition.rb
	app/models/task.rb
	db/schema.rb
	doc/README_FOR_APP.md
fixed per-branch db name in database.yml; updated schema
Modified factories to give sequential names to Conditions and Learners,since validations now require those names to be unique