it builds!
Merge branch 'cm-11.0' of github.com:yareg-com/device_alcatel_cedarlite into cm-11.0

Conflicts:
	BoardConfig.mk
	cm.mk
	custom/config/common.mk
	custom/config/common_full_phone.mk
	custom/product/generic_no_telephony.mk
	device_cedarlite.mk
	prebuilt/environment/environment.txt
	ramdisk/init.cedarlite.usb.rc
	ramdisk/ueventd.cedarlite.rc
	recovery/init.rc
	recovery/recovery_keys.c