Minor coding style improvement
Merge branch 'master' of https://github.com/Arcavias/arcavias-core
Sets VAT ID only if a value is available in the data set
Adds vatid column after the company column as in all other setup tasks
Merge pull request #712 from nsendetzky/master

Sets VAT ID only if a value is available and places it at the same location in all tables