Removed unnused dependency in Makefile
Merge branch 'master' into datepicker
Simplified routes.
Simplified rendering pages and moved pagination to a partial template.