some cleaning up
Merge branch 'master' of git://github.com/AhmedSamy/DynamicDataTablesBundle

Conflicts:
	Datatables/DatatableManager.php