Eliminated getItems methods from non-view files
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/models/templates.php
Merge branch 'dev/j3/common' into dev/j3/free