Zend
Merge branch 'master' of https://github.com/andrestaht/SilmaringiEksamiKeskkond

Conflicts:
	composer.phar
	vendor/autoload.php
	vendor/composer/autoload_real.php