updates and synchronizes menus
merge from master
Merge branch 'master' of https://github.com/andrewparrish/Pandemic
iml settings changed from merge
more gradle shit fixed for naveeds build
removes the util class with the static activity launcher methods, and adds a flag to the intent to remove all other activities above it in the application back stack
Updated popup to include an actual description
Merge branch 'naveed_andrew_test' of https://github.com/andrewparrish/Pandemic into naveed_andrew_test
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