Merge branch 'master' of /Users/kocsen/Documents/repos/CGrepWithActors with conflicts.
new cgre[