Movin n groovin.
Merge remote-tracking branch 'origin/master' into cleanup-tool-subpackages

Conflicts:
	composer.json
Removed. Fixed.
Merge pull request #136 from xi-project/cleanup-tool-subpackages

Cleanup tool subpackages