fix 69
fix sort
upgrade doc
Merge remote-tracking branch 'origin/fix-69'

Conflicts:
	Controller/CrudController.php