SAC-09-08-14-EOD
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/templates/stubs/navbar.ftl