Synchronized with repository and manual merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/authorverification/BaselineNGram.java
Resolved code warnings.