Add HALO source
Merge branch 'cm-10.1' of https://github.com/shumashv1/Schizoid into cm-10.1
Restore bluetooth
Merge branch 'cm-10.1' of https://github.com/shumashv1/Schizoid into cm-10.1

Conflicts:
	default.xml