Merge branch 'katkiss' of git://github.com/timduru/platform-vendor-eos into katkiss

Conflicts:
	packages/ControlCenter/res/raw/change_log.dat

Change-Id: I598494f0a8f1320e0eecdece05568877ece083bc
Merge branch 'katkiss' of git://github.com/timduru/platform-vendor-eos into katkiss