fixed bug in MainActivity that started a connection attempt when returning from black display even if connection was up
Merge branch 'develop' of https://github.com/golvmopp/BGSEP into develop

Conflicts:
	VirtualGamepad/src/bgsep/bluetooth/BluetoothHandler.java