Merge branch 'master' of https://github.com/justokay/XLSParser

Conflicts:
	src/main/java/yuri/misyac/parser/XLSParser.java
	src/test/java/yuri/misyac/parser/XLSParserTest.java