upgrade to 1.10 for master
Merge branch 'master' of github.com:kbonez/DataTables

Conflicts:
	media/js/jquery.dataTables.js