Added manifest.yml
Merge branch 'master' of https://github.com/cloudfoundry-samples/springmvc-hibernate-template

Conflicts:
	manifest.yml