Merge pull request #3 from grams/postGIS

Post gis
Merge pull request #4 from grams/postGIS

Post gis
tomcat 7
reorder baseline files
passwords must be encrypted
Merge pull request #5 from grams/tomcat7

Tomcat7