Test
Pridani buttonu Matlab s pripravou pro volani jar filu
Merge branch 'war' into development

Conflicts:
	README.md
Readme modified
Specfication of project version 1
Merge remote-tracking branch 'origin' into development
Merge branch 'development' into ejb
Merge remote-tracking branch 'origin/development' into development
Merge branch 'development' into ejb
Update to latest version
update ejb
update ejb2
Signed-off-by: odstrtad <odstrcilik.t@seznam.cz>
update ejb3
update
Merge branch 'development' into ejb

Conflicts:
	e-ECG-ejb/nbproject/private/private.properties
verze s problemem s deploy
update ejb
update
update