weblogin moved to new logging
Substitution resolver
added substitution resolver
Merge branch 'master' of https://github.com/brainysmith/idm-blitz

Conflicts:
	idp/idp-netty/src/main/java/App.java