Merge upload and maps branches
Merge branch 'upload' into dev

Conflicts:
	hike/main.py
load track from database + Add POI
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Merge remote-tracking branch 'origin/upload' into dev
Point Of Interest working