BroadleafCommerce/BroadleafCommerce#485  - fixing more issues found when integrating Gift Card as a Payment Method with the Account Credit Module
#79 and BroadleafCommerce/DemoSitePrivate#36  - fixes 500 error
Reordered bl filters.  Fixes #80
Merge remote-tracking branch 'upstream/develop' into develop