sync
Unskipped a unit test
Merge branch 'master' of https://github.com/Wordseer/wordseer_flask into HMJ-XML-Mapper
Added support for data types, date formats and combined text
Merge origin/HMJ-XML-Mapper into HMJ-XML-Mapper