Add info to subscription blocks
Merge branch 'master' of github.com:razzius/funsubscribe

Conflicts:
	public/templates/subscription-block-template.html
ASI