Merge branch 'data_collection' of https://github.com/WhisperSystems/RedPhone into emblem/data_collection_local_testing

Conflicts:
	src/org/thoughtcrime/redphone/Release.java
	src/org/thoughtcrime/redphone/signaling/SessionDescriptor.java
 Mid-progress UserFeedback processing
Merge branch 'emblem/data_collection_local_testing' of https://github.com/WhisperSystems/RedPhone into emblem/data_collection_local_testing

Conflicts:
	src/org/thoughtcrime/redphone/Release.java
	src/org/thoughtcrime/redphone/call/CallManager.java
	src/org/thoughtcrime/redphone/signaling/SessionDescriptor.java
Working Feedback dialog Integrated with call loop