Improve diff view2
use empty string if not editable
Merge branch 'master' of robinson.informatik.uni-bremen.de:awe11
Fix diff bug of application/x