Alterations to membership forms for simple cases
Merge remote-tracking branch 'origin/master' into membership_plus_console
Merge remote-tracking branch 'liggitt/membership_plus_console' into membership_plus_console