Images now shows in the webbrower on the website!
Merge origin/master

Conflicts solved:
	Server/web/index.xhtml
Merge origin/master

Conflicts solved:
	Server/web/index.xhtml