Merge branch 'master' into cgnu
Merge branch 'cgnu' of github.com:Trott/CampusKit into cgnu