Updated default template, etc.
Merge branch 'front-end-dev'

Conflicts:
	.gitignore