Misc changes
Misc changes
Merge branch 'develop' of github.com:twg/TEDxTheme into features/misc
Merge branch 'features/stash' into features/misc
Merge pull request #1 from twg/features/misc

Misc changes