Merge branch 'cm-10.1' of github.com:DerTeufel/android_packages_apps_LockClock into cm-10.1

Conflicts:
	src/com/cyanogenmod/lockclock/ClockWidgetService.java
	src/com/cyanogenmod/lockclock/misc/Constants.java
	src/com/cyanogenmod/lockclock/preference/WeatherPreferences.java

Change-Id: Ice6c7a8031358974b041b37677c64a8ec51f9eca