Merge branch 'evgeniy' into sevoan

Conflicts:
	core.h
	scrollarea.h