Merge branch 'dev/j2/common' into dev/j2/free

Conflicts:
	admin/views/configuration/tmpl/default.php
	admin/views/list/tmpl/advanced.php
	admin/views/list/tmpl/exclude.php
	admin/views/list/tmpl/import.php
	admin/views/list/tmpl/overview.php
	admin/views/subscriber/tmpl/edit.php
	admin/views/uninstall/tmpl/default.php
	build.xml
	newsletter.xml