Merge remote-tracking branch 'remotes/mattburns/master' into integration2

Conflicts:
	src/main/java/com/thebuzzmedia/exiftool/ExifTool.java
- remove duplicate items from integration
- alphabeticaly sorted tags
- formatting
Merge remote-tracking branch 'remotes/justin808/add-subsec-time-tag' into integration2

Conflicts:
	src/main/java/com/thebuzzmedia/exiftool/ExifTool.java
sorted
- format
fix comma
format
Merge branch 'writing' into integration2

Conflicts:
	src/main/java/com/thebuzzmedia/exiftool/ExifTool.java
formatted
Merge branch 'prepare-integration' into integration2

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