Initial commit to make DemoSite account credit compatible.
Fix error in spring instrument path.
adding account credit xml app context for admin
comment out email sender for demo
Update apply credit controller and view.
css changes for gift card on profile page
Minor bug fixes
Fix account credit checkout view style.
adding servlet context for admin
fix load script on DemoSite to accommodate changes in this commit for the framework 4033428200cec64561b68d557a7fd007ac635d37
Merge branch 'develop' into account-credit
Gift card and customer credit updates.
Apply credit style fix.
removing GiftCard functionality for merge into develop
Error handling.
Update copyright year.
Delete trailing whitespace.
Remove whitespace.
Merge remote-tracking branch 'origin/develop' into workflow_support

Conflicts:
	site/src/main/webapp/WEB-INF/web.xml