reorder baseline files
passwords must be encrypted
Merge pull request #6 from grams/tomcat7

Tomcat7