Merge pull request #4 from physikerwelt/master

please merge changes before continuing...
Merge pull request #5 from physikerwelt/master

DataTypes
General code cleanup
  set project properties to UTF-8
  set maven-compiler-plugin version
  commented code
  deleted QueryArticleMatch.java
  made HitTuple sortable
  added path to TestUtils
Merge branch 'master' of https://github.com/jimmyli97/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
general code cleanup
  UTF-8, plugin-version, commented code, deleted QueryArticleMatch
separated into keywordmapper class to avoid dealing with sectionmapper
resolving conflicts
sampledata/samplequery: HTML only for first data and first query
Merge remote-tracking branch 'upstream/master'
resolving more conflicts
Conflicts:
	src/main/java/de/tuberlin/dima/schubotz/fse/SectionMapper.java
Merge pull request #5 from jimmyli97/master

conflicts resolved