Use proper naming scheme
Merge branch 'cm-10.1' of https://github.com/LGOGMuthaFuckah/android_device_lge_geeb_ca into cm-10.1

Conflicts:
	device.mk