map into searchform integration started
Merge branch 'master' of https://github.com/mishto/hubtitude
Merge branch 'master' of https://github.com/mishto/hubtitude
Merge branch 'master' of https://github.com/mishto/hubtitude

Conflicts:
	hubtitude/views.py
map into searchform integration finished, with highlighting
Merge branch 'master' of https://github.com/mishto/hubtitude
map into searchform integration finished, with highlighting