Rebasing with Singleton fix
Merge remote-tracking branch 'ddx/master'
Ready for Image preview then BLE
Merge remote-tracking branch 'ddx/master'