Fixed "Grid: Sorting fails if a scope uses joins"
$ bundle update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/netzke/basepack/data_adapters/active_record_adapter.rb
Fixed `Netzke::Basepack::ActiveRecord::RelationExtensions#extend_with` that only applied the first scope if given an array of scopes