Merge branch 'master' of https://github.com/jawallace/autopsy

Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
Removed color from 64 bit video controls.
Merge branch 'master' of https://github.com/jawallace/autopsy

Conflicts:
	Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
	Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
Removed max heap size from jvm args.
Removed stray character.
Fixed order changed by merge conflict.
Merge pull request #296 from jawallace/master

Remove Max Heap size