fixed empty class
reordered buttons, cleanup
fixed merge
Merge branch 'master' into develop

Conflicts:
	crud/default/views/index.php
	crud/default/views/update.php
	crud/default/views/view.php