updated server
Merge branch 'tema3' of https://github.com/evelinad/TemeIDP.git into
tema3

Conflicts:
	Server.jws