deps
Merge branch 'master' of https://github.com/mcekovic/sf-libs

Conflicts:
	pom.xml