cLock: Fix FC when using monochrome icons with an unknown condition code

Change-Id: I56bf948f9902a20b4153b8628afcec845a6d1bfd
cLock: Bump version

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

Conflicts:
	AndroidManifest.xml
	src/com/cyanogenmod/lockclock/weather/WeatherInfo.java