[TCRYPT-4] removing errors from project pom files
[TCRYPT-4] updating logback pattern
Merge branch 'master' of https://github.com/UW-Madison-DoIT/token-crypt

Conflicts:
	tcrypt-web/pom.xml
finishing merge of pom.xml
[TCRYPT-4] Fixing welcome file list to work with new /apps/* DispatchServlet so that "/" resolves to home page
Merge remote-tracking branch 'origin/master'