removing margins from body, which don't play well with jquery position() or offset()
Merge remote-tracking branch 'upstream/master'