Adjusting margins and adding a no-bottom-margin class
Merge branch '7.x-2.x' of https://github.com/SU-SWS/open_framework into 7.x-2.x