stuff
Merge branch 'master' of github.com:Lutarony/Lutarony

Conflicts:
	WebContent/admin.xhtml
	WebContent/weighing-edit.xhtml
Weighing page renders ok
remove some bugs for DIM