Update build
Update manifest.yml
Update manifest.yml
Update manifest.yml
Update control
Update control
Update install
Update control
Merge branch 'master' of github.com:caruccio/openshift-origin-cartridge-memcached

Conflicts:
	.openshift/action_hooks/build
	bin/control
	bin/install
	metadata/manifest.yml
fix conflicts