Added no reactivation upgrade process; tighter upgrade screens
Merge branch 'feature/smooth-upgrades'
Merge branch 'master' of code.shopp.net:core/shopp