Admin page finished
Merge origin/origin into origin

Conflicts:
	nbproject/project.properties