a
logowanie
oj
Merge branch 'master' of https://github.com/rtoip91/Projekt-JAVAEE

Conflicts:
	panel2/build/web/WEB-INF/classes/entities/Administrator_.class
	panel2/build/web/WEB-INF/classes/entities/Budynek_.class
	panel2/build/web/WEB-INF/classes/entities/Mieszkanie_.class
	panel2/build/web/WEB-INF/classes/entities/Mieszkaniec_.class
	panel2/build/web/WEB-INF/classes/entities/Ogloszenie_.class
	panel2/build/web/WEB-INF/classes/entities/Oplata_.class
	panel2/build/web/WEB-INF/classes/entities/Sprawa_.class
	panel2/build/web/WEB-INF/classes/entities/Uprawnienie_.class
	panel2/build/web/WEB-INF/faces-config.xml
	panel2/nbproject/private/private.properties
	panel2/nbproject/project.properties
	panel2/web/WEB-INF/faces-config.xml