Basic Intent response now placed
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp

Conflicts:
	bin/classes/ca/skule/froshapplication/DayListActivity.class
	bin/classes/ca/skule/froshapplication/DaysEntryAdapter.class
	bin/classes/ca/skule/froshapplication/MainActivity.class
	bin/classes/ca/skule/froshapplication/MapActivity.class
	bin/classes/ca/skule/froshapplication/R$attr.class
	bin/classes/ca/skule/froshapplication/R$dimen.class
	bin/classes/ca/skule/froshapplication/R$drawable.class
	bin/classes/ca/skule/froshapplication/R$id.class
	bin/classes/ca/skule/froshapplication/R$layout.class
	bin/classes/ca/skule/froshapplication/R$menu.class
	bin/classes/ca/skule/froshapplication/R$string.class
	bin/classes/ca/skule/froshapplication/R$style.class
	bin/classes/ca/skule/froshapplication/R.class
	gen/ca/skule/froshapplication/R.java
	src/ca/skule/froshapplication/MapActivity.java
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp.git