3235 with display of warnings on external works edit page
Adding changes to subscriptions_controller and subscriptions index.html.erb
Issue 2750: Allow mods to disable anonymous prompts
Issue 2750: Including cucumber test
Issue 2969: Published Date on works not respecting time zone preference
Issue 2969: Changed how original date is computed.
fixed typos / stories references
fixed forgotten the
changed lines that od commented wanted also changed rather then make new issue since hadn't merged
fixed the ? mark
Merge remote-tracking branch 'origin/3713' into 3713

Conflicts:
	app/views/external_authors/claim.html.erb
removed extra i picked up from merge during push to resolv conflicts
Merge branch 'issue_2750' of github.com:scottsds/otwarchive into Group16

# By Scott D. Sullivan
# Via Scott D. Sullivan
* 'issue_2750' of github.com:scottsds/otwarchive:
  Issue 2750: Including cucumber test
  Issue 2750: Allow mods to disable anonymous prompts

Conflicts:
	app/views/prompts/_prompt_form.html.erb
	features/prompt_memes/challenge_promptmeme.feature.orig
Merge branch 'issue_3535_separate_subscriptions_page' of github.com:Talvalin/otwarchive into Group16

# By Lalith Vipulananthan
# Via Lalith Vipulananthan
* 'issue_3535_separate_subscriptions_page' of github.com:Talvalin/otwarchive:
  Adding changes to subscriptions_controller and subscriptions index.html.erb
Merge branch '3713' of https://github.com/otwstephanie/otwarchive2 into Group16

* '3713' of https://github.com/otwstephanie/otwarchive2:
  removed extra i picked up from merge during push to resolv conflicts
  fixed the ? mark
  changed lines that od commented wanted also changed rather then make new issue since hadn't merged
  fixed forgotten the
  fixed typos / stories references
Merge branch 'issue_2969' of github.com:scottsds/otwarchive into Group16

# By Scott D. Sullivan
# Via Scott D. Sullivan
* 'issue_2969' of github.com:scottsds/otwarchive:
  Issue 2969: Changed how original date is computed.
  Issue 2969: Published Date on works not respecting time zone preference
Merge branch 'issue_3235' of https://github.com/sarken/otwarchive into Group16

# By sarken
# Via sarken
* 'issue_3235' of https://github.com/sarken/otwarchive:
  3235 with display of warnings on external works edit page
Merge pull request #17 from otwstephanie/Group16

Group16