Gave unapprove_label and approve_label more consistent names.
Removed a seemingly pointless call to display_name in comments
This was causing break and is not actually used anywhere.
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop
Removed some debug from comment admin
cardworld theme
Merge remote-tracking branch 'upstream/2.2/develop' into projects/cardworld/develop