Added documentation
Merge branch 'master' of https://github.com/fess89/marketing

Conflicts:
	optins.db