Step 3 modifications
Step 4 modifications
Step 5 modifications
minor realm config fix
minor realm config fix
minor realm config fix
Merge branch 'mods' into step3
Merge branch 'mods' into step4
Merge branch 'mods' into step5
Merge remote-tracking branch 'origin/step3' into step2

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
Merge remote-tracking branch 'origin/step4' into step2

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
Merge remote-tracking branch 'origin/step5' into step2

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
updated app-specific placeholders