fix class name
Merge remote branch 'origin/master'
add some basic error handling upon deletion
fix a bug on date formatting
Merge remote-tracking branch 'origin/master' into fieldset_rewrite

Conflicts:
	classes/model.php