Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
CSPACE-5906: Changed width of cs-structuredDate-popup and added width rule to cs-structuredDate-popup table to ensure visibility of structured date fields
Merge pull request #188 from amywieliczka/CSPACE-5906

CSPACE-5906: Changed width of cs-structuredDate-popup and added width ru...
Merge remote-tracking branch 'upstream/master'
CSPACE-5960: Update login page text, footer test to reflect the v3.2.2 release.
Merge pull request #189 from aronr/CSPACE-5960

CSPACE-5960: Update login page, footer text to reflect v3.2.2 release.
Merge branch 'master' into ucb-deploy

Conflicts:
	src/main/webapp/defaults/js/Footer.js
Merge branch 'ucb-deploy' into ucb-deploy_3.2
Merge branch 'ucb-deploy_3.2' into ucjeps_3.2