Merge remote-tracking branch 'cmorlok/cm-10.1' into jb-4.2

Conflicts:
	BoardConfig.mk
	gps.xml
	kernel
	overlay/packages/apps/Torch/res/values/config.xml
	p5wifi.mk
	proprietary-files.txt
	system.prop
remove unused modules
Merge remote-tracking branch 'origin/jb-4.2' into jb-4.2

Conflicts:
	modules/dhd.ko