Merge pull request #5 from jimmyli97/master

conflicts resolved
More data types
Merge pull request #6 from jimmyli97/master

BUG: in samplequery.html, or in XML reader - cannot parse file. try runn...
Merge branch 'master' of github.com:physikerwelt/mathosphere2

Conflicts:
	src/main/java/de/tuberlin/dima/schubotz/fse/MainProgram.java
	src/main/java/de/tuberlin/dima/schubotz/fse/SectionMapper.java
	src/test/java/de/tuberlin/dima/schubotz/fse/SectionMapperTest.java
reformat code
Merge pull request #6 from physikerwelt/master

merge new