resolved conflict
tests split into unit, function and module tests
added new migration
added full support for all sorts of joins in datatable queries
updated to laravel 4.2.x
test join with search
tests split into unit, function and module tests
added new migration
added full support for all sorts of joins in datatable queries
updated to laravel 4.2.x
test join with search
Merge branch 'development' of github.com:Daveawb/Laravel-Datatables into development
Update README.md
Added in ability to use dot notation with relationships
updated version
Merge branch 'origin/development' into development

Conflicts:
	src/Daveawb/Datatables/Response.php
Merge branch 'development' of github.com:Daveawb/Laravel-Datatables into development
updated git ignore
fixed conflict in composer.json