fix
Merge branch 'admin' of github.com:enjoy2000/papertask into admin

Conflicts:
	module/Admin/src/Admin/Entity/EmailTemplates.php