Adding the Optin page
Merge branch 'master' into 2.1.0
More 2.1 changes, very close now!