updated to java8, more or less.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/tests/MarkupFollowerTest.java