parallel editing
Merge branch 'master' of https://github.com/KroshkaMu/uhg-2013