Composer update
Merge branch 'master' of github.com:atabix/atabase

Conflicts:
	composer.json