#8 Script to add test users and offers
#94 Fix Map bounding box and optimize query
Merge branch 'master' of https://github.com/Trustroots/trustroots

Conflicts:
	public/modules/search/controllers/search.client.controller.js
	public/modules/search/views/search.client.view.html