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