- CHANGELOG.md
- Version Info
Merge branch 'master' of https://github.com/zend-server-extensions/Z-Ray-Composer

Conflicts:
	zray.php