added optional java environment
added potential tomcat server
added tomcat configuration
Merge branch 'master' into spring

Conflicts:
	manifests/modules/common/manifests/db/postgresql.pp
	manifests/modules/symfony/manifests/init.pp