Merge branch 'master' into query
Merge pull request #361 from subvertallchris/master

magic property makeover
Merge pull request #365 from subvertallchris/query

QuickQuery V1
Merge branch 'query' of https://github.com/andreasronge/neo4j into query
Introducing QueryProxy class which allows us to make simpler, more ActiveRecord-like queries in ActiveNode
Continue fixing specs to support QueryProxy class
Since we're not deleting the DB each time
Merge branch 'master' into query

Conflicts:
	lib/neo4j/active_node/property.rb
Fix offset/limit in orm_adapter
Fix count method
Use neo_id key on conditions to get ID(n) WHERE condition
Merge branch 'query' of github.com:andreasronge/neo4j into query
Removing find_by_hash functionality
Merge branch 'query' of github.com:andreasronge/neo4j into query