Feature/bobst affiliate login

Ignore the other feature/*_login branches, this is the most up to date!