Merge branch 'dev' into fullTextSearch
RQ
add columns start, end et distance to roads
temp commit
fix upload
Search Field
Merge branch 'fullTextSearch' into dev

Conflicts:
	hike/__init__.py
	hike/main.py
	hike/templates/index.html
Merge branch 'dev' of ssh://github.com/fhacktory/yoloswag into dev
add level to roads
Merge branch 'sql' into dev
add elevation calculation
Merge branch 'dev' of https://github.com/fhacktory/yoloswag into dev
add road.sql
clean db
add start / end / distance in road.sql
Merge branch 'dev' of https://github.com/fhacktory/yoloswag into dev
Calculate radius (phase 1)
Up fronted
bungalove wesh
Index intregate