Update security config
Added better support for Jackson JAX-RS serialization.
update security config
Rework property file inclusion
Allow hot sauce images to show in the admin.
Property logging cleanup
Remove admin permissions from import
Removing the combined module until we can fully address pathing problems
Added display_order to admin_section tables.
Make the tmp directory the default for new images when in dev.
remove the message source cache timeout
Use the Broadleaf Image server instead of maintaining two sets of images.
Set development cacheable properties to control the thymeleaf cache, message resource cache, and dynamic dao cache.   Defaults set to 2 seconds in development.
i18n catalog data for demo site
Merge remote-tracking branch 'upstream-DemoSite/admin3' into develop

Conflicts:
	admin/src/main/resources/runtime-properties/development.properties
	admin/src/main/resources/runtime-properties/local.properties
	combined/build.xml
	combined/pom.xml
	combined/src/main/webapp/WEB-INF/applicationContext-filter-combined.xml
	combined/src/main/webapp/WEB-INF/web.xml
	core/src/main/resources/sql/load_admin_security.sql
	site/src/main/resources/runtime-properties/development.properties
	site/src/main/resources/runtime-properties/local.properties