Minor gem updates, made sure version restrictions were justified
Seems my Gemfile.lock got out of sync during an update
Attempt to work around Travis not creating concerto_configs table before using it
Travis and Devise 3.4.x are not compatible with the current secret_key approach we're using
Forgot an initializer line
Revert: An attempt to upgrade Rails/Devise to somewhat newer versions broke both our secret key creation and database adapter detection
Bump to 2.2.3.
@mikldt Per #1159, changing expected message to debug instead of warn.
I don't know how a change to this line happened in my last commit via the Github editor - I'm hoping logger.warn is correct here.
Per http://www.w3.org/TR/PNG/#A-Media-type and @robp2175, adding x-png
Undo bad commit to concerto.yml from c127f402d0bba574d9ea4858c86e717bd6fb5513
remove duplicate content tools
remove duplicate eager_load
fix error message
remove puts
properly return json in media controller if no iframe transport is used
remove old workaround for IE - and get dragging back working

the removed code prevented proper working dragging relying javascipt, e.g. jquery-ui draggable, when a rangeinput was on the page
make suffler class part of session key to prevent crash when switching shufflers that have different cache data format
Merge pull request #1162 from simplysoft/housekeeping

I have no problem with that
Merge branch 'master' into rails-4.2

* master:
  make suffler class part of session key to prevent crash when switching shufflers that have different cache data format
  remove old workaround for IE - and get dragging back working
  properly return json in media controller if no iframe transport is used
  remove puts
  fix error message
  remove duplicate eager_load
  remove duplicate content tools
  Undo bad commit to concerto.yml from c127f402d0bba574d9ea4858c86e717bd6fb5513
  Per http://www.w3.org/TR/PNG/#A-Media-type and @robp2175, adding x-png
  I don't know how a change to this line happened in my last commit via the Github editor - I'm hoping logger.warn is correct here.
  @mikldt Per #1159, changing expected message to debug instead of warn.
  Bump to 2.2.3.
  Revert: An attempt to upgrade Rails/Devise to somewhat newer versions broke both our secret key creation and database adapter detection
  Forgot an initializer line
  Travis and Devise 3.4.x are not compatible with the current secret_key approach we're using
  Attempt to work around Travis not creating concerto_configs table before using it
  Seems my Gemfile.lock got out of sync during an update
  Minor gem updates, made sure version restrictions were justified

Conflicts:
	config/environments/test.rb