NEMO-1838 Merge branch 'multi_tenant' into 1838-multi_tenant_rails4

Conflicts:
	lib/apartment.rb
	lib/apartment/adapters/abstract_adapter.rb
	lib/apartment/adapters/abstract_jdbc_adapter.rb
	lib/apartment/adapters/jdbc_mysql_adapter.rb
	lib/apartment/adapters/jdbc_postgresql_adapter.rb
	lib/apartment/adapters/mysql2_adapter.rb
	lib/apartment/adapters/postgresql_adapter.rb
	lib/apartment/adapters/sqlite3_adapter.rb
	lib/apartment/database.rb
	lib/apartment/migrator.rb
	lib/tasks/apartment.rake
	spec/adapters/mysql2_adapter_spec.rb
	spec/database_spec.rb
	spec/dummy/app/models/user.rb
	spec/examples/connection_adapter_examples.rb
	spec/examples/elevator_examples.rb
	spec/examples/generic_adapter_examples.rb
	spec/integration/apartment_rake_integration_spec.rb
	spec/integration/query_caching_spec.rb
	spec/support/contexts.rb
	spec/support/requirements.rb
	spec/tasks/apartment_rake_spec.rb
	spec/unit/migrator_spec.rb
	spec/unit/reloader_spec.rb
NEMO-1838 Bump ruby and remove gemset