add preferenceItem working
commit
Merge http://github.com/jflester/CostOfLivingDiary into jflester-master

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/CostOfLivingDiary.apk
	bin/classes.dex
	bin/classes/com/example/costoflivingdiary/AddPreferenceActivity$1.class
	bin/classes/com/example/costoflivingdiary/AddPreferenceActivity$2.class
	bin/classes/com/example/costoflivingdiary/AddPreferenceActivity.class
	bin/resources.ap_
	res/layout/addpref.xml
	src/com/example/costoflivingdiary/AddPreferenceActivity.java
list of countries
added bin
added back in things
rest of commit