favorites and details update
Merge branch 'master' of
https://github.com/infinitycodeservices/WNY-We-Care

Conflicts:
	WNYWeCare/bin/R.txt
	WNYWeCare/gen/com/wny/wecare/R.java