Merge origin/master

Conflicts:
	web/index.xhtml
Merge branch 'master' of https://github.com/elsasantos/projecto8
Merge branch 'master' of https://github.com/elsasantos/projecto8
Merge origin/master

Conflicts:
	web/index.xhtml
Merge origin/master

Conflicts:
	web/index.xhtml
Merge origin/master

Conflicts:
	web/index.xhtml
Merge branch 'master' of https://github.com/elsasantos/projecto8

Conflicts:
	src/java/pt/uc/aor/edcodisrt/endpoint/MyWhiteboard.java
	web/resources/css/cssLayout.css
	web/resources/template/WhiteboardTemplate.xhtml