Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/android/launcher2/AllAppsList.java
	src/com/android/launcher2/DynamicGrid.java
	src/com/android/launcher2/Launcher.java
	src/com/jiayu/config/jiayuLauncherConfig.java