Revert "Revert "disable zRam""

This reverts commit 936363c24e042426199105ee31ab881d9cc10147.
enable crystalTalk
Revert "temporarily disable oc"

This reverts commit e919487fc8e8ed5c0557ec6984e48dd458c833fc.
add more twrp options
use 3.0 kernel for twrp
leave only MPEG4 codec
Fix bootmenu permissions after installing an incremental update.

This could break booting after flashing an incremental. Unfortunately
I'm not sure what breaks the permissions when flashing the incremental.
Merge pull request #20 from xdarklight/cm11.0-2.6.32

Fix bootmenu permissions after installing an incremental update.
add flag rmrf for system
Merge remote-tracking branch 'upstream/cm11.0-2.6.32' into kitkat-aosp

Conflicts:
	overlay/packages/services/Telephony/res/values/array.xml
	overlay/packages/services/Telephony/res/values/config.xml
	profiles/ramdisk/init.mapphone_umts.rc
Do not enable CrystalTalk, not ready
Revert "leave only MPEG4 codec"
not needed for aosp/omni

This reverts commit 4bccc330b07716df3154e8d79bba41d045ba5661.
Merge branch 'kitkat-aosp' into defy-4.4-2.6.32

Conflicts:
	releasetools/jordan-common_ota_from_target_files.py