admin page
for merge
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-dao/src/main/java/school/dao/implementation/GroupDaoImpl.java
	school-web/.settings/org.eclipse.jdt.core.prefs
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-service/.settings/org.eclipse.wst.common.component
	school-web/.classpath