integrate team feedback

Signed-off-by: Simone Campora <simone.campora@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	war/resources/html/welcome.jsp