Fixed language definition
Fixed #186 - Bug with select box not retaining selections on edit screen
Merge remote-tracking branch 'origin/develop'