Fixed som stuff in Pollard
Merge remote-tracking branch 'origin/master'

Conflicts:
	QS/src/Test.java
Fixed som stuff in Pollard