Pro version promo sidebar and email opt-in
Merge branch 'develop' into email-optin

Conflicts:
	assets/css/styles.css
Low DPI style fixes.
Merge pull request #132 from deliciousbrains/email-optin

Pro version promo sidebar and email opt-in