updates from live 2
Merge branch 'master' of https://github.com/DesignPond/plugin_newsletter

Conflicts:
	logs/log.txt