adding new upgrade classes
Merge branch 'master' of https://github.com/rek/gunday
minor style fixes