Merge origin/master

Conflicts:
	height.css
	helper-css.css