Display rotate settings & new lockscreen interface

derp

Conflicts:
	src/com/android/settings/DisplaySettings.java