removed popup/transcript
Merge branch 'develop'