knex 0.6 support
Merge branch 'master' of https://github.com/PhilWaldmann/openrecord

Conflicts:
	package.json