Updated to match release 1.2.2
First round of language corrections
Second round of language corrections
Merge branch 'develop'