Bugfixes Mapping, especially modified Border and BorderId
Column names
added log4j dependency
modified column names
merge