Merge origin/master

Conflicts:
	src/main/java/pt/uc/dei/aor/projecto8/whiteboard/facades/WhiteboardFacade.java
	src/main/webapp/resources/js/whiteboard.js