Merge remote-tracking branch 'upstream/master'
Refactor file uploading (#7267)
Used Gson in Spade converter
simplified modularization by using Java's native SPI
[imiger-spade-converter] use imiger-vo classes instead of own copies
move plugins to sources directory