fix #535 (exception if there are multiple font-family entries in css)
Fixed missing header for MacUnitTest
Merge branch 'kolyvan-issue_536' into develop