dateUtils+new buttons+counter style edit + tokens
Merge branch 'master' of https://github.com/vsomov/SchoolPortal.git

Conflicts:
	school-ui-test/src/test/java/page/HomePageTest.java
	school-ui-test/src/test/java/page/LoginPageTest.java
	school-web/src/main/webapp/views/tiles/header.jsp