stufffffffff sorry
Merge branch 'master' of github.com:brunodea/dswebt1

Conflicts:
	WebContent/templates/index.xhtml