Merge branch 'master' into objectPosition

src/tap/formatter/ResultSet2VotableFormatter.java

src/tap/formatter/SVFormat.java

src/tap/formatter/TextFormat.java

src/tap/formatter/VOTableFormat.java

src/tap/log/DefaultTAPLog.java

src/tap/log/TAPLog.java

src/tap/metadata/TAPColumn.java

src/tap/metadata/TAPMetadata.java

src/tap/metadata/TAPSchema.java

src/tap/metadata/TAPTable.java

src/tap/metadata/TAPTypes.java

src/tap/metadata/TableSetParser.java

src/tap/metadata/VotType.java

src/tap/parameters/DALIUpload.java

src/tap/parameters/FormatController.java

src/tap/parameters/MaxRecController.java

src/tap/parameters/TAPDestructionTimeController.java

src/tap/parameters/TAPExecutionDurationController.java

src/tap/parameters/TAPParameters.java

src/tap/resource/ASync.java