Integrating changes form upstream: Default template
Adding .gitignore
Merge branch 'master' into public