Renamed manifest.yml
Merge branch 'master' of github.com:leoetlino/openshift-cartridge-php

Conflicts:
	metadata/manifest.yml