Fixes #1887 Added proper template handling
Conflicts: plugins/admin/users/class_userManagement.inc plugins/personal/generic/class_user.inc setup/class_setupStep_Migrate.inc
include/class_template.inc
0 → 100644
Conflicts: plugins/admin/users/class_userManagement.inc plugins/personal/generic/class_user.inc setup/class_setupStep_Migrate.inc