Merge pull request #317 from ruijunhuang2010/master

Merge pull request #45 from ChrisBoesch/master
Merge pull request #102 from ChrisBoesch/master

Updates
Badge Display fix #3

- state badges required to complete only if its badge challenge
Merge pull request #318 from ShaikDawood/master

Badge Display fix #3
Challenge creator cosmetic changes
Merge pull request #319 from ShaikDawood/master

Challenge creator cosmetic changes
Merge pull request #46 from ChrisBoesch/master

update