dependencies without conflicts...
fix deprecated scopes
remove match in routes
disable cache_sweeper for now
add secret base
disable exception notification for now
add missing gems extracted from rails
use compatible (hacked) version of active admin
remove whiny nils and add eager load option
Merge branch 'master' into rails4

Conflicts:
	config/routes.rb
make a request spec out of the api stuff
please, no cache-digest
remove deprecation
move to strong parameters
make active_admin work with strong parameters
working compas version
working friendly_id version
working exception_notification version
support for rails console
update some gems