teacher changes
add new teacher futures
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/src/main/java/com/softserve/controller/TeacherController.java
	SSEL/src/main/java/com/softserve/dao/StudentGroupDao.java
	SSEL/src/main/java/com/softserve/dao/impl/StudentGroupDaoImpl.java
	SSEL/src/main/java/com/softserve/service/StudentGroupService.java
	SSEL/src/main/java/com/softserve/service/TopicService.java
	SSEL/src/main/java/com/softserve/service/impl/StudentGroupServiceImpl.java
	SSEL/src/main/webapp/WEB-INF/jdbc.properties
	SSEL/src/main/webapp/WEB-INF/jdbc.properties.orig
	SSEL/src/main/webapp/WEB-INF/spring/appServlet/app_tiles.xml
	SSEL/src/main/webapp/WEB-INF/tiles/pages.xml
	SSEL/src/main/webapp/WEB-INF/tiles/templates.xml
	SSEL/src/main/webapp/WEB-INF/tiles/tiles-definitions.xml
	SSEL/src/main/webapp/WEB-INF/views/templates/base-template.jsp
	SSEL/target/classes/com/softserve/controller/GuestController.class
	SSEL/target/classes/com/softserve/controller/TeacherController.class
	SSEL/target/maven-archiver/pom.properties
r
rfew
cc
Merge branch 'hash'
f

Conflicts:
	SSEL/target/classes/com/softserve/controller/GuestController.class
	SSEL/target/classes/com/softserve/controller/RegistrationController.class
	SSEL/target/classes/com/softserve/controller/TeacherController.class
	SSEL/target/classes/com/softserve/service/MailService.class
	SSEL/target/classes/com/softserve/service/TopicService.class
	SSEL/target/classes/com/softserve/service/impl/MailServiceImpl$1.class
	SSEL/target/classes/com/softserve/service/impl/MailServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/TopicServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/UserDetailsServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/UserServiceImpl.class
	SSEL/target/classes/com/softserve/validator/RegistrationValidation.class
	SSEL/target/maven-archiver/pom.properties
sdf#
add new futures
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/.classpath
	SSEL/.gitignore
	SSEL/.project
	SSEL/.settings/org.eclipse.jdt.core.prefs
	SSEL/.settings/org.eclipse.wst.common.component
	SSEL/.settings/org.eclipse.wst.common.project.facet.core.xml
	SSEL/src/main/java/com/softserve/controller/GuestController.java
	SSEL/src/main/java/com/softserve/dao/RoleDao.java
	SSEL/src/main/java/com/softserve/dao/impl/RoleDaoImpl.java
	SSEL/src/main/java/com/softserve/service/RoleService.java
	SSEL/src/main/java/com/softserve/service/impl/RoleServiceImpl.java
	SSEL/src/main/java/com/softserve/service/impl/UserServiceImpl.java
	SSEL/src/main/webapp/WEB-INF/spring/appServlet/app_tiles.xml
	SSEL/src/main/webapp/WEB-INF/spring/security.xml
	SSEL/src/main/webapp/WEB-INF/tiles/pages.xml
	SSEL/src/main/webapp/WEB-INF/tiles/templates.xml
	SSEL/src/main/webapp/WEB-INF/views/pages/student.jsp
	SSEL/src/main/webapp/WEB-INF/views/templates/student_menu.jsp
	SSEL/src/main/webapp/WEB-INF/views/templates/teacher_menu.jsp
Update GuestController.java
Update RoleDao.java
Update RoleDaoImpl.java
Update RoleService.java
Update RoleServiceImpl.java
Update UserServiceImpl.java
Update pages.xml
Update templates.xml
Delete tiles-definitions.xml
Update security.xml