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