Commit it to win it
Merge commit 'd24786c26d33a9f3a723d05d19b4567e90b2c1e2' into Ken

Conflicts:
	DDMainBLE/DDGyroModeViewController.m