Merging some changes with master
Merge branch 'master' of https://github.com/Adi3000/latroquette.git

Conflicts:
	pom.xml