Added catalyst role
Changed order of roles on member portlet

Did some re-indentation in view.xhtml
Merge remote-tracking branch 'origin/catalyst'
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab