rearrange application/views with application/views/block
Merge branch 'clearview' into last

Conflicts:
	application/views/admin/layout.php