FIX postediting validation in activities
Merge branch 'js'
Merge branch 'master' into dev