merge from svn 70
Merge branch 'master' of https://github.com/atti92/StarCantata