2.2.1 upgrade
Merge branch 'master' of https://github.com/sadecesabri/Haksle

Conflicts:
	project/plugins.sbt