Other changes
Merge branch 'master' of https://github.com/mrunalpatki/VideoSearch

Conflicts:
	src/AudioThread.java
Merge branch 'master' of https://github.com/mrunalpatki/VideoSearch

Conflicts:
	src/GenerateHeuristics.java
	src/videoplayer/md/GraphicMetadata.java
	src/videoplayer/md/ImagePixel.java