bumped scala version
Merge remote-tracking branch 'remotes/FaKod/master'

Conflicts:
	pom.xml