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 data to DB: 1) birthdate to USER table 2) currentProject, teamLeadCurrentProject, projectManagerCurrentProject to STUDENT table
finish excel export, fix excel beans
small mail bean fixes
merge
Add transactional to some services
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice into develop
Some changes in file, which importing to disk
Drop NOT NULL property for email in USER
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice
Merge branch 'alan'
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
Fix add student function.