some changes
Merge branch 'master' of https://github.com/TeamHomerSimpson/HomerList

Conflicts:
	bin/HomerList.apk
	bin/classes.dex
	bin/classes/android/homerlist/GoogleMaps.class
	bin/classes/android/homerlist/R$id.class
	bin/classes/android/homerlist/R$layout.class
	bin/classes/android/homerlist/R$string.class
	bin/classes/android/homerlist/R$style.class
	bin/classes/android/homerlist/SecondScreen.class
	bin/classes/android/homerlist/ThirdScreen.class
	bin/resources.ap_
	gen/android/homerlist/R.java
	res/values/strings.xml