fix resize logic
Merge branch 'dev' into freeze

Conflicts:
	src/main/webapp/resources/js/sulka.core.js
merge dev