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
updated app-specific placeholders
Merge branch 'step2' into step3

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
Merge branch 'step3' into step4

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
fix apiKeyFileLocation
Merge branch 'step4' into step5

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
Merge branch 'step5' into step6

Conflicts:
	src/main/webapp/WEB-INF/shiro.ini
Merge branch 'step6' into step7