minor realm config fix
minor realm config fix
minor realm config fix
minor realm config fix
Merge branch 'mods' into step2
Merge branch 'mods' into step3
Merge branch 'mods' into step4
Merge branch 'mods' into step5
Update for my environment

Change place holders to match my environment.
Update for my environment
Merge Step3 to Step4
Merge Step 4 to Step 5.
Merge remote-tracking branch 'origin/step5' into step6

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini