Fixed help links and helpers
Merge branch 'development' into dev/j2/common

Conflicts:
	admin/views/list/tmpl/exclude.php
Merge branch 'dev/j2/common' into dev/j2/free

Conflicts:
	admin/views/configuration/tmpl/config_general.php
	admin/views/list/tmpl/exclude.php
	admin/views/list/tmpl/import.php
	admin/views/list/tmpl/overview.php
	admin/views/newsletter/tmpl/send.php
	admin/views/subscriber/tmpl/edit.php