save game: qflow visual change
Consolidate functionality to use only 1 db
progress on qflow design changes
Merge branch 'master' of https://github.com/opengovernment/opengovernment-app into qflow
finishing form styles and consolidating css
Merge branch 'master' of https://github.com/opengovernment/opengovernment-app into qflow
grab the latest testing before fixing qflow tests

* master:
  Fix person_id being dropped when zipcode entered
Fix JavaScript error that assumed elem exists
Merge branch 'master' into move-to-1-db

* master:
  Fix person_id being dropped when zipcode entered

Conflicts:
	spec/requests/questions_spec.rb
Update to WIP towards steps necessary for 1 db
Add missing development database name
removed unnecessary () from Meeting spec test
added a control to extend Devise, styles for data collections, tool tip styles
Merge branch 'qflow' of https://github.com/opengovernment/opengovernment-app into qflow
Added a few more OS level requirements to the README.md.
Merge branch 'master' of github.com:datamade/opengovernment-app
Added a few stub files for a mailer that gets triggered when a user publishes a question
Merge branch 'master' into move-to-1-db

* master: (22 commits)
  Added a few more OS level requirements to the README.md.
  Finish refactor of Meeting
  Remove redundant municipality, use metadatum
  Change date field to date_and_time w/ better type
  Change fulltext to full_text
  Drop Meeting prefix from Agenda & Minutes & move to embed
  Specify security patched redis-namespace gem
  Finish test of loading meetings
  Merging @derekeder's work into topic branch - WIP
  created spec for Meeting .load_from_api_for_jurisdiction
  renamed meeting object for import
  added agenda and minutes accessors to meeting model, spec'd out meeting_minutes and meeting_agenda
  renamed minutes and agenda to reflect as subdocument of meeting, saving as subdocuments on import
  stubbed out embedded documents for agenda and minutes
  properly setting private methods for meeting model
  moving scraped_local_gov to private methond
  added meeting_spec, ensuring presence of name, date, municipality
  renamed Agenda to Meeting, moved mongo import to load_from_apis_for_jurisdiction method in model
  removed unused to_slug function from city_council.rake
  handling more complicated Minutes object (minutes fulltext scrape implemented in legistar-scrape)
  ...

Conflicts:
	README.md
	config/mongoid.yml
merge
merge