old
Merge remote-tracking branch 'origin/master'

Conflicts:
	RandGKA/bin/RandGKA.apk
	RandGKA/bin/classes.dex
	RandGKA/bin/classes/cz/muni/fi/randgka/library/RandExtractor.class
	RandGKA/bin/classes/cz/muni/fi/randgka/library/UniversalHashFuncRE.class
	RandGKA/bin/classes/cz/muni/fi/randgka/provider/UHRandExtractorSpi.class
	RandGKA/bin/classes/cz/muni/fi/randgka/provider/random/RandExtractor.class
	RandGKA/bin/classes/cz/muni/fi/randgka/provider/random/UHRandExtractor.class
	RandGKA/bin/classes/cz/muni/fi/randgka/randgkaapp/RandExtractor2AppActivity.class
	RandGKA/bin/classes/cz/muni/fi/randgka/randgkamiddle/MinEntropySourceActivity.class
	RandGKA/bin/classes/cz/muni/fi/randgka/random/MinEntropySource.class
	RandGKA/src/cz/muni/fi/randgka/library/RandExtractor.java
	RandGKA/src/cz/muni/fi/randgka/library/UniversalHashFuncRE.java
	RandGKA/src/cz/muni/fi/randgka/provider/UHRandExtractorSpi.java
	RandGKA/src/cz/muni/fi/randgka/provider/minentropy/CameraMES.java
	RandGKA/src/cz/muni/fi/randgka/provider/minentropy/MinEntropySource.java
	RandGKA/src/cz/muni/fi/randgka/provider/random/CameraMES.java
	RandGKA/src/cz/muni/fi/randgka/provider/random/MinEntropySource.java
	RandGKA/src/cz/muni/fi/randgka/provider/random/RandExtractor.java
	RandGKA/src/cz/muni/fi/randgka/provider/random/UHRandExtractor2.java
	RandGKA/src/cz/muni/fi/randgka/provider/random/UHRandExtractorSpi.java
	RandGKA/src/cz/muni/fi/randgka/randgkaapp/RandExtractor2AppActivity.java
	RandGKA/src/cz/muni/fi/randgka/randgkamiddle/MinEntropySourceActivity.java
	RandGKA/src/cz/muni/fi/randgka/random/CameraMES.java
	RandGKA/src/cz/muni/fi/randgka/random/MinEntropySource.java
	RandGKA/src/cz/muni/fi/randgka/random/UHRandExtractor.java
	RandGKA/src/cz/muni/fi/randgkaapp/GKAProtocolPrintKeyAppActivity.java