Eliminated getItems methods from non-view files
Merge branch 'development' into dev/j2/free