cLock: Make the showing of weather when minimized a user option

Also includes some code cleanup

Change-Id: Iad2c4dba4f6e1d77fae28d3f52fa1ef878815614
cLock: Remove redundant code and cleanup, bump version

- This commit removes some seemingly redundant code in the preference
  headeradapter.
- Since lots of things have been changed in cLock since the first version
  was merged, time for a version bump.

Change-Id: I335516c60ec4506447a175d7fab3babd6b7dc9a1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	src/com/cyanogenmod/lockclock/misc/Preferences.java

	modified:   AndroidManifest.xml
	modified:   res/layout/appwidget.xml
	modified:   res/layout/appwidget_small.xml
	modified:   res/layout/clock_panel.xml
	modified:   res/layout/clock_panel_small.xml
	modified:   res/layout/preference_header_item.xml
	modified:   res/menu/options_menu.xml
	modified:   res/values/strings.xml
	modified:   res/xml/preferences_calendar.xml
	modified:   res/xml/preferences_weather.xml
	modified:   src/com/cyanogenmod/lockclock/ClockWidgetService.java
	modified:   src/com/cyanogenmod/lockclock/misc/Constants.java
	modified:   src/com/cyanogenmod/lockclock/misc/Preferences.java
	modified:   src/com/cyanogenmod/lockclock/preference/Preferences.java
	modified:   src/com/cyanogenmod/lockclock/preference/WeatherPreferences.java