researcher support for stops answer
stops question, added limit parameter
Fixed key conflict for map to user feature
(cherry picked from commit e87107f)
(cherry picked from commit b113ba1)
Facebook api querying now uses new where model
(cherry picked from commit 6099efe)
(cherry picked from commit b9c2c82)
Added NAME to resampled_location so it can be run by celery
(cherry picked from commit e38aefc)
(cherry picked from commit e43d4c9)
Fixed bug where negative limit values might trigger a query without limit clause
Merge branch 'devel' of https://github.com/MIT-Model-Open-Data-and-Identity-System/SensibleData-Service into devel
Changed version
Merge branch 'release-0.2.6'

Conflicts:
	CHANGELOG
	VERSION