Removed obsolete code. Fixed phpStorm warnings
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/controllers/list.php
	admin/controllers/template.php
Merge branch 'dev/j3/common' into dev/j3/free