Newer version, uses iframes for pages
Merge remote-tracking branch 'origin/mockupcss'
Merge branch 'master' of https://github.com/utwente-di/di07