Merge branch 'master' of git://github.com/tumic0/GPXSee

Conflicts:
	gpxsee.pro
	src/GUI/graphview.cpp
	src/GUI/gui.cpp
	src/GUI/gui.h
	src/GUI/mapview.cpp
	src/GUI/mapview.h
	src/app.cpp
	src/emptymap.h
	src/map/downloader.cpp
