Hopefully fixed problems with xls test
Merge branch 'master' of https://github.com/Data2Semantics/Hackathon2
Merge branch 'master' of https://github.com/Data2Semantics/Hackathon2
Merge branch 'master' of https://github.com/Data2Semantics/Hackathon2
Merge branch 'master' of https://github.com/Data2Semantics/Hackathon2