bump gem versions, ignore newer settings files
Merge branch 'master' into rails-4

* master:
  don't call partial that was removed in 41783a0f41dd5519902ab5475c10c5f784169c36
remove mass assignment config
Merge branch 'master' of github.com:concerto/concerto into rails-4

* 'master' of github.com:concerto/concerto:
  add strong params to users #82
use http verbs
Merge branch 'master' into rails-4

* master:
  allow parameters in registration step, correct misspelling
add in new schema generation
use rails 4 defaults
the assets group no longer exists
Merge branch 'rails-4' of https://github.com/concerto/concerto into rails-4

* 'rails-4' of https://github.com/concerto/concerto:
  use rails 4 defaults
use railties.each
remove gem
use callable blocks, :conditions are depreciated
use callable blocks
add in callable blocks
don't use dynamic helpers
remove mass assignment sanitizer config
add in newer devise settings
prepare to migrate to secret key base
Merge branch 'master' of https://github.com/concerto/concerto into rails-4

* 'master' of https://github.com/concerto/concerto: (126 commits)
  Change .all.empty? to !.exists?
  Refactor check_for_initial_install to be faster.
  After many tribulations, a nice clean around_filter...
  setup webrick for ssl testing
  Cache the number of children content for #483.
  Only use the around_filter for logged in users.
  And accomodating decade old software (08/04/2003) definitely never gets old
  Accomodating Travis' cocaine never gets old...
  Left in some testing code
  Working on #481, added timezone column for users as well as ConcertoConfig access to the app-wide timezone setting
  Only show email on user#show and show it to anyone logged in.
  show groups as thumbs, handle email prefs
  color for group-membership icons
  autosubmit on checkbox click
  reorg user group list
  locked better errors to ruby >1.9
  added better errors to help poor marvin
  entry for gem_version
  add tr to rows in table
  change from list to table
  ...

Conflicts:
	.gitignore
	Gemfile.lock
	app/models/concerto_plugin.rb
	config/initializers/03-devise.rb
	db/schema.rb
	db/seeds.rb