fix word_wrap mixin
formatting
formatting
remove safari hack
add IE9 fix
Merge branch 'master' of github.com:cargomedia/CM into issue-1079

Conflicts:
	layout/default/css/function.usertext.less
Merge branch 'master' of github.com:cargomedia/CM into issue-1079

Conflicts:
	layout/default/css/function.usertext.less
Merge branch 'master' of github.com:cargomedia/CM into issue-1079

Conflicts:
	layout/default/css/mixins.less
merge upstream
Merge pull request #1079 from christopheschwyzer/issue-1079

fix word_wrap mixin