composer.phar update
php inherited methods fix for install process
Merge branch 'matuszeman-install-fix' into develop

Conflicts:
	composer.phar