Upgrades fixed

don't last after restart
Merge branch 'master' of https://github.com/cpcsc/snowboarding

Conflicts:
	project.greenfoot