adding macro for rendering maps autocomplete
changing searches to use macro
hooking up resource admin to new templates
marking latitude/longitude fields as hidden
Merge remote-tracking branch 'upstream/master' into issue-115-wtforms-address

Conflicts:
	remedy/admin.py
adding user default location configuration in Admin
adding skeleton for merging categories
getting basic category merging working

found some problems with the geocoding views, however, so those'll need
to be fixed.
hiding latitude/longitude fields client side

Something of a hack, but I think any other solution would end up being a
worse hack at this point.
adding view to identify category-less resources
adding view for assignment and corresponding action
ordering categories in merge view
Merge pull request #143 from radioprotector/issue-115-wtforms-address

Hook up Admin address fields to Google Maps
Merge pull request #145 from radioprotector/issue-130-delegate-categories

Admin functionality for delegating categories
Merge pull request #147 from radioprotector/issue-146-resource-category-management

Bulk-assignment of resource categories and detection of category-less resources