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

Conflicts:
	admin/views/list/tmpl/exclude.php