SPOT-272: fixes behavior for sorting by distance when no center is given
SPOT-580: caching of spot jsons so we don't build the same json for each request
SPOT-580: modified existing tests to use the dunmmy cache (as they don't test for caching behavior)
SPOT-580: Moved json caching logic to the spot model methods
SPOT-658: Updated tests that use dummy caching to import and mock models instead of views
Merge branch 'master' of git://github.com/abztrakt/spotseeker_server

Conflicts:
	test/search/capacity.py
Merge branch 'master' into json-caching

Conflicts:
	test/hours/put.py
SPOT-659: All tests that could inadvertently store use the cache now explicitly use dummy cache
SPOT-657: Admin bulk delete method overridden to use model method (so cache is updated)
SPOT-656: added a test class that tests json caching behaviour
Added new requirement 'mock' - this helps us keep the unit tests from failing because of the server cache.
Merge branch 'jswan2' into working

Conflicts:
	views/search.py
no longer breaks when trying to delete an individual SpotImage

fixes SPOT-666
Merge branch 'spot666'