changes to local
Merge
upload to server part.
merge before push
commit server integration
Merge branch 'master' of https://github.com/tdahlstrom/WA_Food_Coalition

Conflicts:
	FoodDonorAndroid/AndroidManifest.xml
	FoodDonorAndroid/src/org/wafoodcoalition/givecamp/fooddonor/Donate.java