Fix app.coffee merge conflicts
Fix locale-en.json merge conflicts