Added FILE_TYPE Tag.  Added Sidecar class for merging sidecar xmp files.
formatted
Merge branch 'prepare-integration' into integration2

Conflicts:
	src/main/java/com/thebuzzmedia/exiftool/ExifTool.java