Merge pull request #41 from Magenic/master

Merge from master
#168 User should not be able to edit approved badge if not an administrator.
Merge pull request #171 from Bowman74/master

#168 User should not be able to edit approved badge if not an administrator