merge
Merge branch 'master' of https://github.com/xguttner/randgka

Conflicts:
	RandGKA/bin/classes/cz/muni/fi/randgka/bluetoothgka/BluetoothCommunicationService$ListenSocketThread.class
	RandGKA/bin/classes/cz/muni/fi/randgka/bluetoothgka/BluetoothCommunicationService.class
	RandGKA/bin/classes/cz/muni/fi/randgka/provider/minentropy/CameraMES.class
	RandGKA/bin/classes/cz/muni/fi/randgka/randgkaapp/MinEntropySourceAppActivity.class
	RandGKA/bin/classes/cz/muni/fi/randgka/randgkaapp/ProtocolBroadcastReceiver.class