Corrected margin-* class override so only affects left and right margins.
Merge pull request #1947 from pjackson28/v3.0

Corrected margin-* class override so only affects left and right margins