merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge http://www.github.com/sleuthkit/sleuthkit
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Smoss/sleuthkit
minor test fixes
Fixed Data Model tests
Merge remote-tracking branch 'upstream/master'
Changed Data Model lvs to BttmUp
Updated gold standards
Updated file titles for testing
Merge branch 'master' of https://github.com/Smoss/sleuthkit

Conflicts:
	bindings/java/test/org/sleuthkit/datamodel/BottomUpTest.java
	bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
	bindings/java/test/org/sleuthkit/datamodel/TopDownTraversal.java
Updated submodules
Merge pull request #176 from Smoss/master

Updated test file names.
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit