Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/android/launcher2/AppsCustomizePagedView.java
	src/com/jiayu/config/jiayuLauncherConfigCajon.java