hid caching for now because it doesn't work properly
Merge branch 'master' of https://github.com/Mrbilec/CMPUT301W14T09-GPSForm.git
Fixed Caching, need to change sorting to account for this fix
Merge branch 'master' of
https://github.com/Mrbilec/CMPUT301W14T09-GPSForm.git

Conflicts:
	CMPUT301W14T09/src/ca/cmput301w14t09/elasticSearch/ElasticSearchOperations.java