Signed-off-by: Tiago Vaz Teixeira <tiago.vt@gmail.com>
Merge branch 'master' into teste

Conflicts:
	Example1/WebContent/index.jsp