hz
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice

Conflicts:
	src/main/java/com/exadel/studbase/web/controller/TestController.java
	src/main/webapp/WEB-INF/ActionSpringMVC-servlet.xml
	src/main/webapp/html/login.html
	src/main/webapp/html/studentInfo.html
add term mark field
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice

Conflicts:
	src/main/webapp/html/studentInfo.html
	src/main/webapp/js/info/studentInfo.js
add documents table
controllers for save changes in exadel info
                    and get documents
add documents table
controllers for save changes in exadel info
                    and get documents
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice

Conflicts:
	src/main/webapp/html/login.html
	src/main/webapp/html/studentInfo.html
	src/main/webapp/js/info/studentInfo.js
Fixes
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice into develop
Merge branch 'master' of https://github.com/alexey-kozlenkov/ExadelPractice

Conflicts:
	src/main/java/com/exadel/studbase/domain/impl/User.java
Fix adding Student bug;
Some changes in ExcelView: smaller column for Skills, white font for header.
Code rearrange
DataBase updates