add scoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/SelectEatingPlaceActivity.apk
	bin/classes.dex
	bin/classes/com/example/eatanywhere/ListViewImageActivity$1.class
	bin/classes/com/example/eatanywhere/ListViewImageActivity$2.class
	bin/classes/com/example/eatanywhere/ListViewImageActivity$3.class
	bin/classes/com/example/eatanywhere/ListViewImageActivity.class
	bin/classes/com/example/eatanywhere/R$drawable.class
	bin/classes/com/example/eatanywhere/R$id.class
	bin/classes/com/example/eatanywhere/R$layout.class
	bin/classes/com/example/eatanywhere/R$menu.class
	bin/classes/com/example/eatanywhere/R$string.class
	bin/classes/com/example/eatanywhere/R$style.class
	bin/resources.ap_
	gen/com/example/eatanywhere/R.java
	src/com/example/eatanywhere/ListViewImageActivity.java