Merge pull request #1 from nickhargreaves/master

backend stuff
faster location and time filter queries
Merge pull request #2 from nickhargreaves/master

faster queries
Merge branch 'master' of github.com:nickhargreaves/MapFour
Merge branch 'master' of github.com:AkramDweikat/MapFour