rewrite method delete
rewrite method delete
rewrite method delete
registration
new classes
update pom
Signed-off-by: romahomyshyn <roma.homyshyn@gmail.com>
regg
registration finish, userservice add method register
message
Merge branch 'master' of ssh://github.com/nromanen/Ch-025

Conflicts:
	SSEL/src/main/java/com/softserve/controller/GuestController.java
	SSEL/src/main/java/com/softserve/controller/HomeController.java
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/BlockDao.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/CategoryDao.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/CourseSchedulerDao.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/RoleDao.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/StudentGroupDao.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/TopicDao.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/dao/impl/BlockDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/CategoryDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/CourseSchedulerDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/RoleDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/StudentGroupDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/SubjectDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/TopicDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/dao/impl/UserDaoImpl.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/Block.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/Category.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/CourseScheduler.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/Role.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/StudentGroup.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/Subject.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/Topic.class
	SSEL/target/entity-1.0.0-BUILD-SNAPSHOT/WEB-INF/classes/com/softserve/entity/User.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/RoleService.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/RoleServiceImpl.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/spring/appServlet/servlet-context.xml
Merge branch 'roma' of ssh://github.com/nromanen/Ch-025

Conflicts:
	SSEL/src/main/java/com/softserve/controller/GuestController.java
	SSEL/src/main/webapp/WEB-INF/tiles/tiles-definitions.xml
	SSEL/src/main/webapp/WEB-INF/views/index.jsp
huh
fres