cleaning up branches - pushing site monitor
Redballoon moved to socialnetworkprize page

Conflicts:
	portlets/redballoon-portlet/src/main/java/org/xcolab/portlets/redballoon/web/action/ProcessUserEmailAction.java
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab
Merge branch 'refs/heads/master' into april_tasks