commit
Merge branch 'master' of https://github.com/rtoip91/Projekt-JAVAEE

Conflicts:
	panel2/nbproject/project.properties