Merge branch 'develop'
Added translations to entry output as read only field
Enabled PIL
Disabled PIL again. Meant to push that to develop branch
Fixed merge conflict
Fixed build
Merge branch 'master' into develop