changed the way the upgrade possibility is determined
Merge branch 'mantis-157' into dev
fixed the build list not being extended correctly
Merge branch 'mantis-158' into dev