Merge origin/master

Conflicts:
	src/batalhanaval/Client.java
	src/batalhanaval/Match.java