a
trying to fix git

Signed-off-by: Martin Tomasi <martin.tomasi@gmail.com>
Merge branch 'master' into martin

Conflicts:
	src/main/webapp/table.xhtml