Working on task
new step
proposal sharing: implemented json controller
proposal sharing: Added recipient validation code
Implemented screenName validation
Fixed activity subscription email scheduler
Added logging
Moved email scheduling to hook
Login page replacing default ugly page
twitter text changes erik
changed url placeholder
changed wording to 'publish proposal'
Better share message for email/twitter
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab

Conflicts:
	portlets/redballoon-portlet/src/main/webapp/WEB-INF/views/sharePage.jsp
Fixed send mechanism in proposal messaging feature
Merge remote-tracking branch 'origin/master' into proposal_messaging

Conflicts:
	portlets/proposals-portlet/src/main/webapp/css/proposals.css
Added email address name to subscription feature
Small view bug fix
cleanup
small fix