prevent margin-centered from conflicting with top and bottom margin
Merge branch 'master' into dev
hotfix for green buttons
Merge branch 'master' into dev