Fixed untracked files
Added jdbc.properties, removed target
Changes
Changes
Changes tiles-definitions
Changes
GuestController
Guest controller, tiles
Replaced dump, rewrited some entities
Fixed bugs frof previous commits
Fixed bug with index.jsp
del
del
Readd all
Rewrited jsps
Merge branch 'master' into ivan

Conflicts:
	SSEL/src/main/java/com/softserve/controller/GuestController.java
	gSEL/target/classes/com/softserve/controller/GuestController.class
	Ssfsw
	aa
	q
	qweeqe+

	q

	+
	/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/entity-1.0.0-BUILD-SNAPSHOT.war
	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/templates/index/menu.jsp
	SSEL/target/maven-archiver/pom.properties

git rebase --continue
--abort
git
$git merge --abort

delete
d
+d
[+]
cl
-a
a
A
all

-a

y
yes
no
q
++++
ad
/?
?
--?
exit
bot
com