Merge branch 'master' into front-end
Compressed images
Compressed images
Merge branch 'front-end' of https://github.com/FransTwisk/bluebottle into front-end
Merge pull request #535 from FransTwisk/front-end

Front end