Merge pull request #44 from Magenic/master

Merge pull request #167 from jwendl/master
Merge pull request #171 from Bowman74/master

#168 User should not be able to edit approved badge if not an administrator
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.
Merge pull request #174 from Bowman74/master

#170, changed image rule so it is tied to the path property as well so e...
Merge pull request #46 from Magenic/master

Merging changes to my local fork.
Fixing issue #170
Fixing issue #168
Merge pull request #175 from jwendl/master

Fixing issues 170 and 168
Merge pull request #42 from Magenic/master

Merge from Master