temporary fix for collage view
Merge branch 'html' of github.com:nbproject/nbproject into html
Merge branch 'html' of https://github.com/nbproject/nbproject into html