Fixed paths
Set CacheMaxAge 1 year on images
Fixes #37
Merge remote-tracking branch 'origin/master' into deploy
Merge branch 'deploy' of github.com:utwente-di/di06