updated to latest CM10.1 sources
Merge remote-tracking branch 'upstream/master'

Corrected conflicts:
	src/android/romstats/Utilities.java

Change-Id: I8905232d453f063a9b4ab1ba36193328ac80e2a1