Show groups in user page
Merge branch 'forum'

Conflicts:
	public/userprofile.php
Merge branch 'master' of github.com:aarmea/RPI-Study-Solutions