Signed-off-by: Emil <Emil@10.16.104.239>
Merge branch 'master' of https://github.com/emilhein/02344.git

Conflicts:
	02334/WebContent/Index.jsp