Final updates.
Merge branch 'master' of ssh://mpb.li:222/orgarec