Merge remote-tracking branch 'zeus/pull_request_03_12_2013_a' into zeus_updates
config/deploy/has-production.rb -- deploy from master
fix failing student tests
Merge remote-tracking branch 'zeus/pull_request_03_12_2013_a' into zeus_updates
Merge branch 'master' into zeus_updates
fix relative path problem when loaded from delayed_job
Devise: OldRestfulAuthenticationSha1  Preserve restful password hashes.

Our version of restful authentication was old enough that the pre-canned
version of restful_authentication_sha1 wasn't decrypting our old password
hashes.
Revert OldRestfulAuthenticationSha1: (configuration error?)

I realize that I must be missing something, because this code has been
deployed successfully on staging sites. My local problems must be
the result of a local configuration problem....

Maybe the span in development mode?

Revert "Devise: OldRestfulAuthenticationSha`1  Preserve restful password hashes."

This reverts commit d50d76c8f113a34fe1bcdd9aa3d2fd27f80a4235.
Devise : initalizers/devise.rb : in dev mode, use same password hash.
Fix feature tests

- Fix feature tests.
Fix feature tests

- Fix feature tests for investigation count.
Refine default data creation.

Handle uniqueness of email for users.
Refine default data creation.

- Refine creation of linked investigation.
Fix researcher report feature test.

- Remove duplicate question prompts.

- Avoid duplicate page names.
Change default_wait_time to 5 seconds.

- Change default_wait_time to 5 seconds.
Merge branch test_cleanup_03_25_2013_a

- Merge branch 'test_cleanup_03_25_2013_a' into
  pull_request_04_04_2013_a
Refine database.sample.yml.

- Create separate environment for cucumber database.
Merge branch pull_request_04_04_2013_a

- Merge branch pull_request_04_04_2013_a into
  test_cleanup_04_02_2013_a