Merge branch 'master' of
https://github.com/soberstadt/CNMT480_GIS_ANDROID into soberstadt-master

Conflicts:
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/BuildConfig.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/Location.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/MapActivity.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$attr.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$color.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$drawable.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$id.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$layout.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$string.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$style.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R$styleable.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/R.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/util/SystemUiHider$OnVisibilityChangeListener.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/util/SystemUiHider.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/util/SystemUiHiderBase.class
	480_GIS_Spring_2013/bin/classes/edu/uwsp/CNMT_GIS/util/SystemUiHiderHoneycomb.class
	480_GIS_Spring_2013/gen/edu/uwsp/CNMT_GIS/R.java
	480_GIS_Spring_2013/res/layout/activity_map.xml