update button & icon mixins; remove units from line-height properties
Merge branch 'master' of https://github.com/populr-themes/harding

Conflicts:
	styles/main.less