Merge branch 'release/2.0.0.pre2' into develop
Merge branch 'master' into develop
adding query caching
update bundle for dummy apps under spec
update bundle for dummy apps under spec
Separating the client from the handler
Implement a resource cache (analogous to AR query cache)
use per-thread registry for resource cache
move certain options into the railtie
fix typo
minor fix
improved logging
update bundle for dummy apps under spec
Merge branch 'feature/query-cache' into develop

Conflicts:
	spec/rails-3.2/Gemfile.lock
	spec/rails-4.0/Gemfile.lock
Merge branch 'release/0.2.0.pre3'