Merge branch 'lsvx/sails0.10' and 'master' of sails-neo4j into 'ColinRoache/sails0.10'

Conflicts:
	lib/adapter.js
	test/create.js