Merge branch 'cm-10.1' into CM10.1

Conflicts:
	AndroidManifest.xml
	res/layout-land/launcher_land.xml
	res/layout/workspace_divider_top.xml
	res/values-sw720dp/config.xml
	res/xml/preferences_dock.xml
	res/xml/preferences_homescreen.xml
	src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
	src/com/cyanogenmod/trebuchet/EditDropTarget.java
	src/com/cyanogenmod/trebuchet/InfoDropTarget.java
	src/com/cyanogenmod/trebuchet/Launcher.java
	src/com/cyanogenmod/trebuchet/LauncherModel.java
	src/com/cyanogenmod/trebuchet/PagedViewCellLayout.java
	src/com/cyanogenmod/trebuchet/Workspace.java
RocketLauncher Dream: Compensate for rotation and allow dim screen

Change-Id: I4c2a392c4bc8de53f990f6ff19c84dfe22bf78c4
Merge branch 'cm-10.1' into CM10.1