Merge pull request #21 from mbertrand/gn20upgrade-merge

Partial fix to base template, pavement.py & settings
Fix custom group authorization
Merge remote-tracking branch 'jj/gn20upgrade-merge' into gn20upgrade-merge