allow change of subscripiton type after registration
Merge branch 'master' into paypal