shit files
tiles for index, login and course page
Conflicts:
	SSEL/src/main/webapp/WEB-INF/views/course.jsp
ignored
Fix subscribe
Merge branch 'master' of https://github.com/nromanen/Ch-025

Conflicts:
	SSEL/.settings/org.eclipse.jdt.core.prefs
	SSEL/.settings/org.eclipse.wst.common.component
	SSEL/target/classes/com/softserve/controller/GuestController.class
	SSEL/target/classes/com/softserve/controller/RegistrationController.class
	SSEL/target/classes/com/softserve/controller/StudentCabinetController.class
	SSEL/target/classes/com/softserve/controller/TeacherController.class
	SSEL/target/classes/com/softserve/dao/BlockDao.class
	SSEL/target/classes/com/softserve/dao/CategoryDao.class
	SSEL/target/classes/com/softserve/dao/CourseSchedulerDao.class
	SSEL/target/classes/com/softserve/dao/RoleDao.class
	SSEL/target/classes/com/softserve/dao/StudentGroupDao.class
	SSEL/target/classes/com/softserve/dao/SubjectDao.class
	SSEL/target/classes/com/softserve/dao/TopicDao.class
	SSEL/target/classes/com/softserve/dao/UserDao.class
	SSEL/target/classes/com/softserve/dao/impl/BlockDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/CategoryDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/CourseSchedulerDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/RoleDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/StudentGroupDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/SubjectDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/TopicDaoImpl.class
	SSEL/target/classes/com/softserve/dao/impl/UserDaoImpl.class
	SSEL/target/classes/com/softserve/entity/Block.class
	SSEL/target/classes/com/softserve/entity/Category.class
	SSEL/target/classes/com/softserve/entity/CourseScheduler.class
	SSEL/target/classes/com/softserve/entity/Role.class
	SSEL/target/classes/com/softserve/entity/StudentGroup.class
	SSEL/target/classes/com/softserve/entity/Subject.class
	SSEL/target/classes/com/softserve/entity/Topic.class
	SSEL/target/classes/com/softserve/entity/User.class
	SSEL/target/classes/com/softserve/form/Registration.class
	SSEL/target/classes/com/softserve/service/BlockService.class
	SSEL/target/classes/com/softserve/service/CategoryService.class
	SSEL/target/classes/com/softserve/service/CourseSchedulerService.class
	SSEL/target/classes/com/softserve/service/MailService.class
	SSEL/target/classes/com/softserve/service/RoleService.class
	SSEL/target/classes/com/softserve/service/StudentCabinetSevice.class
	SSEL/target/classes/com/softserve/service/StudentGroupService.class
	SSEL/target/classes/com/softserve/service/SubjectService.class
	SSEL/target/classes/com/softserve/service/TopicService.class
	SSEL/target/classes/com/softserve/service/UserService.class
	SSEL/target/classes/com/softserve/service/impl/BlockServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/CategoryServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/CourseSchedulerServiceImpl.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/RoleServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/StudentCabinetServiceImp.class
	SSEL/target/classes/com/softserve/service/impl/StudentGroupServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/SubjectServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/TopicServiceImpl.class
	SSEL/target/classes/com/softserve/service/impl/UserServiceImpl.class
	SSEL/target/classes/com/softserve/validator/RegistrationValidation.class
	SSEL/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	SSEL/target/m2e-wtp/web-resources/META-INF/maven/com.softserve/entity/pom.properties
New gitignore
Merge branch 'master' into roma

Conflicts:
	SSEL/src/main/webapp/WEB-INF/tiles/tiles-definitions.xml
	SSEL/src/main/webapp/WEB-INF/views/course.jsp
	SSEL/src/main/webapp/WEB-INF/views/templates/menu.jsp
final gitignore
Tiles for student, update page registration, index page update
Delete entity-1.0.0-BUILD-SNAPSHOT.war
Fixed commits
Add few jsp
Update StudentGroupDao,
dfdg
gitignore
Merge remote-tracking branch 'origin/master' into roma

Conflicts:
	SSEL/.gitignore
	SSEL/src/main/java/com/softserve/controller/GuestController.java
	SSEL/src/main/java/com/softserve/dao/impl/UserDaoImpl.java
	SSEL/src/main/java/com/softserve/service/impl/UserDetailsServiceImpl.java
	SSEL/src/main/java/com/softserve/validator/RegistrationValidation.java
	SSEL/src/main/webapp/WEB-INF/spring/appServlet/app_tiles.xml
	SSEL/src/main/webapp/WEB-INF/spring/root-context.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/index.jsp
	SSEL/src/main/webapp/WEB-INF/views/pages/login.jsp
	SSEL/src/main/webapp/WEB-INF/views/pages/registration.jsp
	SSEL/src/main/webapp/WEB-INF/views/templates/base-template.jsp
	SSEL/src/main/webapp/WEB-INF/views/templates/menu.jsp
	SSEL/src/main/webapp/WEB-INF/web.xml
	SSEL/target/classes/com/softserve/controller/GuestController.class
	SSEL/target/classes/com/softserve/controller/TeacherController.class
	SSEL/target/classes/com/softserve/service/TopicService.class
	SSEL/target/classes/com/softserve/service/impl/TopicServiceImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/controller/GuestController.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/controller/RegistrationController.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/controller/StudentCabinetController.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/controller/TeacherController.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/SubjectDao.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/UserDao.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/form/Registration.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/MailService.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/StudentCabinetSevice.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/SubjectService.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/UserService.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/impl/MailServiceImpl$1.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/impl/MailServiceImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/impl/StudentCabinetServiceImp.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/service/impl/UserServiceImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/validator/RegistrationValidation.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/spring/root-context.xml
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/templates/index/footer.jsp
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/templates/index/menu.jsp
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/templates/student/menu.jsp
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/templates/teacher/header.jsp
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/tiles/tiles-definitions.xml
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/web.xml
	SSEL/target/maven-archiver/pom.properties
update tiles
fixed page
add loggin to db