added doc for margin collapsing
bug fix in margin collapsing conditions
margin collapsing bug fix