Fixed popup URL (double slash)
Merge branch 'dev'