Merge branch 'exp'
Halo: Add master switch to disable Halo (2/2)
fix derp
Merge branch 'jellybean-legacy'