Merge origin/master

Conflicts:
	src/java/pt/uc/aor/edcodisrt/endpoint/MyWhiteboard.java