fixed bug with shadow header and button save
Merge branch 'master' into julia
education add average marks
Merge branch 'master' into julia

Conflicts:
	src/main/webapp/css/common.css