More fixes upstream (tweaks to patches previously applied here)
Better sanity checking for broken CSS
Inform the user if broken CSS data exists in the message
Convert non-period decimal points to periods
Merge branch 'master' into horde_activesync_3_0