Hi all, I just added the map into the draft, but it only be shown on the phone rather than emulator, and I also have no idea about how to set up the emulator
Merge branch 'master' of https://github.com/gatsby93/INB372

Conflicts:
	SmartWatch/.classpath
	SmartWatch/.project
	SmartWatch/.settings/org.eclipse.jdt.core.prefs
	SmartWatch/AndroidManifest.xml
	SmartWatch/bin/AndroidManifest.xml
	SmartWatch/bin/R.txt
	SmartWatch/bin/SmartWatch.apk
	SmartWatch/bin/classes.dex
	SmartWatch/bin/jarlist.cache
	SmartWatch/bin/resources.ap_
	SmartWatch/project.properties
	SmartWatch/res/layout/activity_watch.xml
	SmartWatch/res/values-v11/styles.xml
	SmartWatch/res/values-v14/styles.xml
	SmartWatch/res/values/strings.xml
	SmartWatch/res/values/styles.xml
	SmartWatch/src/com/example/smartwatch/WatchActivity.java