Fixed bugs
Merge branch 'dev' of https://github.com/cnizzdotcom/cakephp-datatable into dev

Conflicts:
	Controller/Component/DataTableComponent.php