Merge pull request #779 from Zahnstocher/r1.8

Fix navigation intent regexp (c:geo and others) and restore support for c:geo geo intent