Fix translation.js includes (weird it was already on dev?!)
Merge branch 'dev' into feature/207-refactoring
Merge dev..again