Eliminated JView from project
Merge branch 'development' into dev/j2/common

Conflicts:
	admin/views/media/view.html.php
	admin/views/test/view.html.php
Merge branch 'dev/j2/common' into dev/j2/free