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

Conflicts:
	bin/HomerList.apk
	bin/classes.dex
	bin/classes/android/homerlist/DbManager.class
	bin/classes/android/homerlist/Goal.class
	bin/classes/android/homerlist/MainActivity$1$1.class
	bin/classes/android/homerlist/MainActivity$1.class
	bin/classes/android/homerlist/MainActivity.class
	bin/classes/android/homerlist/ThirdScreen$MyReceiver.class
	bin/classes/android/homerlist/ThirdScreen.class