shit files
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
final gitignore
update tiles
fixed page
some commit
delete pages
add module
Modify webapp
teacher changes
remove garbage files
Add modules viewer for student
add logging
Merge branch 'master' into anatoliy
delete garbage files
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