#961 - Fixed changing font size for the same font multiple times in Redactor editor
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
#965 - Added ENUM
Fixes #967
#968 - enable level 2 cache for catalog collection on SiteImpl
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop