Merge pull request #916 from Arantor/release-2.1

PM menu and other goodness
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1

Signed-off-by: Peter Spicer <sleeping@myperch.org>