Merge pull request #130 from ChrisBoesch/master

Updates
Theme Change to challengeEdit.html
Merge pull request #131 from ChrisBoesch/master

Updates
Merge pull request #426 from ShaikDawood/master

Theme change to challengeEdit.html
Merge pull request #427 from ruijunhuang2010/master

Merge pull request #19 from ChrisBoesch/master
Merge pull request #20 from ChrisBoesch/master

update