Merge branch 'cm11.0-2.6.32' of https://github.com/Quarx2k/android_device_moto_jordan-common into cm11.0-2.6.32

Conflicts:
	bootmenu/binary/logwrapper
	bootmenu/bootmenu.mk
	bootmenu/script/2nd-boot.sh
	bootmenu/script/recovery.sh
delete splashmenu second copy
changes for safestrap
Merge branch 'cm11.0-2.6.32' of https://github.com/Quarx2k/android_device_moto_jordan-common into HEAD
Merge commit 'fa11e59' into dirty

Conflicts:
	BoardConfig.mk
	bootstrap/binary/logwrapper
	bootstrap/bootstrap.mk
	bootstrap/hbootuser/Android.mk

Change-Id: I189b1dce1fe4317659129ff108698ffd4505f953
remove duplicate entry

Change-Id: Iae003b02de0a1142acb154f0d1cb343aa44d85d1