Timezone fixes
Merge branch 'master' of github.com:jintrone/XCoLab

Conflicts:
	portlets/proposals-portlet/src/main/webapp/xhtml/pageTypes/contests/widget_CONTEST_PHASES.xhtml