Made alignment change for super-administrator, and removed the commented old code as advised by Andrew.
Merge remote-tracking branch 'origin/rails4' into rails4