Merge branch 'master' of https://github.com/mcintyre321/Mvc.JQuery.DataTables

mcintyre321 · mcintyre321 · commit 174e6ee6e068 · 2016-05-19T08:30:42.000+01:00
# Conflicts:
#	.gitmodules
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter"]
 	path = Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter
 	url = https://github.com/mcintyre321/jquery-datatables-column-filter.git
-	branch = master
+	branch = master
