Temp commit to Allow merge
Merge branch 'master' into stuart

Conflicts:
	src/JsonManager.cpp
	src/JsonManager.hpp
Added MapView and pins on the map to show bus stops.
Merge branch 'stuart'
Fixing some bugs from my merge.