Start work on Auth Surface controller. Finish Contact Form. Start work on experimental app startup to register member type
Sort out merge conflicts
Merge remote-tracking branch 'origin/master'