fixes the XML for the upgrade screen and changes the main activity to be the map view
Merge branch 'naveed_andrew_test' of https://github.com/andrewparrish/Pandemic into naveed_andrew_test
adds symptom class, adds a new table to the DB, and creates persistent data storage for the upgrade screen