cross browser fixes
Merge branch 'master' of https://github.com/punkave/apostrophe