added url key
Merge branch 'develop' of github.com:rubenkostucki/nomnivor into autocomplete_map_search
added autocomplete to location search
fixed issues
Merge branch 'autocomplete_map_search' of https://github.com/rubenkostucki/nomnivor into autocomplete_map_search

Conflicts:
	app/assets/javascripts/map.js