removed  Java 1.7 code
Preferences and Settings
Merge branch 'data_collection' of https://github.com/WhisperSystems/RedPhone into data_collection

Conflicts:
	src/org/thoughtcrime/redphone/RedPhone.java
	src/org/thoughtcrime/redphone/ui/ApplicationPreferencesActivity.java
Merge remote-tracking branch 'origin/data_collection' into data_collection
Merge branch 'data_collection' into emblem/data_collection_local_testing

Conflicts:
	src/org/thoughtcrime/redphone/Release.java
	src/org/thoughtcrime/redphone/signaling/SessionDescriptor.java