Start work with filter
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice into develop
Filter is ready!
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice

Conflicts:
	src/main/java/com/exadel/studbase/dao/IDocumentDAO.java
	src/main/java/com/exadel/studbase/domain/impl/Student.java
	src/main/java/com/exadel/studbase/web/controller/TestController.java
	src/main/webapp/html/studentInfo.html
Change getAllForThisMaster(...) method signature
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice into develop

Conflicts:
	src/main/webapp/html/list.html
Working with filter
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice into develop

Conflicts:
	src/main/java/com/exadel/studbase/dao/IEmployeeDAO.java
	src/main/java/com/exadel/studbase/dao/impl/EmployeeDAO.java
	src/main/java/com/exadel/studbase/dao/impl/FeedbackDAO.java
	src/main/java/com/exadel/studbase/dao/impl/GenericDAOImpl.java
	src/main/java/com/exadel/studbase/dao/impl/UserDAO.java
	src/main/java/com/exadel/studbase/service/IStudentViewService.java
	src/main/java/com/exadel/studbase/web/controller/InfoPageController.java
	src/main/java/com/exadel/studbase/web/controller/ListPageController.java
	src/main/webapp/js/list/filter.js
Continue work with filter
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice into develop

Conflicts:
	src/main/webapp/js/list/filter.js
Filter is ready for more tests :)