HFOSS Syllabus - v1.2
Merge remote-tracking branch 'origin/develop'
User "badges" now have a link to each user's participants page

Conflicts:
	hflossk/templates/blogs.mak
!
Merge remote-tracking branch 'upstream/master' into fixParticipantLinks

Conflicts:
	hflossk/templates/blogs.mak
Merge pull request #429 from liam-middlebrook/fixParticipantLinks

Fix participant links