* *
Merge origin/master

Conflicts:
	.gitignore
	tests/worms/model/PartialFacadeTest.java