Changed Map Activity into Map View
added my R.java since java kept on complaining.
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp.git

Conflicts:
	gen/ca/skule/froshapplication/R.java