Merging with Dorimanx RAMDISK. Thanks to him:)
Merge remote-tracking branch 'alu/aosp-4.4' into aosp-4.4

Conflicts:
	res/customconfig/battery.profile