Merge branch 'c5' of git://github.com/SlimDev/device_samsung_hercules into c5

Conflicts:
	candy5.mk
	cm.dependencies

Change-Id: Ibedab7f80b9dc3b624c4993335552a362139a247