pagination with date picker add sql dump
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
pagination with date picker add sql dump