Added project template.
Merged changes