composer stuff
Merge branch 'master' of github.com:big-eye/client

Conflicts:
	composer.json