Expando stuff & start work on new registration portlet
Merge branch 'master' of https://github.com/jintrone/XCoLab

Conflicts:
	hooks/climatecolab-hooks/src/main/webapp/WEB-INF/liferay-hook.xml
registration