fixed conditionals on the parser
Merge branch 'master' of https://github.com/gemarcano/HotBodies
Merge of two files
Conflicts:
	src/DoubleTextParser.cpp
Merge branch 'master' of https://github.com/gemarcano/HotBodies
auto merge