removied ie7 compat
Merge remote branch 'upstream/master'