Merge pull request #25 from AuthoringUI/widget-dropdown

merging pull request #25
Merge remote-tracking branch 'upstream/develop' into widget-dropdown

* upstream/develop: