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
Reorganized code.

!!!!!!!!!!!!!!!!!!!!!!!!!! NOT STABLE !!!!!!!!!!!!!!!!!!!!!!!!!
Layout changes
Dialog organized.
Clear rest control.

!!!!!!!!!!!!!!!!!!!!!!!!!! NOT STABLE !!!!!!!!!!!!!!!!!!!!!!!!!
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
Update fields in student & skillSet - from int to Integer
Code reorganization...

!!!!!!!!!!!!!!!!!!!!!!!!!! NOT STABLE !!!!!!!!!!!!!!!!!!!!!!!!!
Merge branches 'develop' and 'master' of https://github.com/alexey-kozlenkov/ExadelPractice
Reorganize ListPageController
Merge branch 'develop' of https://github.com/alexey-kozlenkov/ExadelPractice
Merge branch 'alan'

Conflicts:
	src/main/webapp/html/studentInfo.html
Some more merging node.

!!!!!!!!!!!!!!!!!!!!!!!!!! NOT STABLE !!!!!!!!!!!!!!!!!!!!!!!!!
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
Change images size to 32x32.
Add simple student add.
Fixed html and js bugs.
merge
Add transactional to some services