Update badges/discussion_badges.py
Upgrade webapp2 to 2.5.1\nChanged default app to khan-testing
Fix URLs for any app id
Translation, not complete
Add missing default icon
Fix autoupdate when running
Translation of search results video count
Merge branches 'translation' and 'translation' of https://github.com/PerceptumNL/KhanLatest into develop
reading tables 2
Merge branch 'master' of https://github.com/PerceptumNL/KhanLatest
Removed duplicated icon_name
bugherd/#242 close, size of energy points buttons
Merge branches 'translation' and 'translation' of https://github.com/PerceptumNL/KhanLatest into develop
Merge branch 'translation' into develop
Add topic icons when showing exercises, fix publishing when running local
Fix and refactor; default icon_url for topics
Fix exercise vital-statistics not showing
Merge branch 'develop' into exercises
Fix pictures in reading_pictographs_1 and 2, closes T26
Fix multiple choices when answer is none of them