Search function backends
Merge branch 'master' of https://github.com/BudgetWiser/budgetmap

Conflicts:
	budgetmap/app.js
got myself out of merge hell