Fixed popup
Merge branch 'master' of ssh://git@github.com/jocklas/devguiGroup8.git