Merge pull request #100 from ChrisBoesch/master

Updates
Merge pull request #101 from ChrisBoesch/master

Updates
Badge Display fix #1

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

Badge Display fix #1