FreeMarker templates
FreeMarker templates
FreeMarker templates
FreeMarker templates
FreeMarker templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/src/main/webapp/WEB-INF/templates/security_manager_appliances.ftl