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

Conflicts:
	panel2/build/web/WEB-INF/classes/Beans/OplataBean.class
	panel2/nbproject/private/private.xml