Removed use of StringTokenizer in getUniquePath in both FsContent and
AbstractFile and replaced with String.split() method.
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit
Merge pull request #146 from adam-m/master

jni data content stream offset>0 fix
Many updates in support of 'getParent' changes (see AUT-725).
Update FsContent.getFileSystem() to do a DB query rather than crawl the
hierarchy to the FileSystem.  Also added clause for throwing
TskCoreException.
Updated AbstractContent.getParent to not throw an exception when getting
the parent of an Image; returns null instead.
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/FileSystem.java
	bindings/java/src/org/sleuthkit/datamodel/FsContent.java
More fixes in support of AUT-725.
Removed commented-out code from LayoutFile.
Merge pull request #147 from tmciver-basis/master

Changes in support of AUT-714 and AUT-725
added size to malloc error messages