SimpleMachines/SMF2.1 — pull request #2387 by Oldiesmann (2014-09-29 04:18:18+00:00)
Title: ! Actually fix #2375 this time, and do some general code cleanup as well

This fixes the following issues:
1. Fix #2375 - caused by the admin token not getting included in that form.
2. Code cleanup:
- Don't nest forms (it's not valid)
- Extraneous space in a couple of div tags