Removed unused files and folders
Merge development into dev/j3/common
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/views/updater/tmpl/default.php
Merge branch 'dev/j3/common' into dev/j3/free