Properly handle inexistent files
Remove old css file reference
Merge branch 'develop'