Finished BluetoothActivity classes
Conflict fixes