Merge origin/master

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

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

Conflicts:
	web/resources/template/WhiteboardTemplate.xhtml