Merge pull request #42 from Magenic/master

Merging into my local fork.
Fixing issue #163
Merge pull request #164 from jwendl/master

Fixing issue with close button missing.
Merge pull request #40 from Magenic/master

Merge from Master
#162 fixed problem with code that adds extra permission records as part of the nightly service.
Merge pull request #165 from Bowman74/master

 #162 fixed problem with code that adds extra permission records
Merge pull request #43 from Magenic/master

Merging into my local fork.
Fixing issue #166
Fixing issue #163
Merge pull request #167 from jwendl/master

Fixing issues.
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 #173 from Magenic/master

Merge from Master