Merge branch 'cm-10.2' of https://github.com/Mustaavalkosta/android_device_htc_ace into cd-4.3

Conflicts:
	BoardConfig.mk
	cm.mk
	device_ace.mk
	prebuilt/kernel/kernel
	ramdisk/fstab.spade
	ramdisk/init.spade.rc