ok
Merge branch 'ws1314_3' of http://github.com/lanice/cg2sandbox into ws1314_3