Update lots of changes to sub project, add google maps, add new templates
Missing files