Add location specific base templates
Merge remote-tracking branch 'origin/master'