After merge all code cherry tanmay firt commit
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/view/AdminPanel.form
	src/view/AdminPanel.java