Added jquery failover for non-html5 browsers
Fixed merge conflict