Fixed datatables
Merging Ashish's changes
Merge branch 'master' of github.com:abhirakshit/Nirvana
Fixed datatables