fixes for UI feedback code after moxie's review
changes per moxie
Merge remote-tracking branch 'origin/emblem/data_collection_local_testing' into call_metrics

Conflicts:
	res/values/strings.xml
	src/org/thoughtcrime/redphone/call/CallManager.java