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
#170 Locked down image size of uploaded images, also made sure uploaded images are actually images.
Merge pull request #172 from Bowman74/master

#170 Locked down image size of uploaded images, also made sure uploaded ...
Merge pull request #45 from Magenic/master

Updating my local repository.