Initial commit
added templates
fixed naming issue
tidied up the template
Merge remote-tracking branch 'project-silpa/master'

Conflicts:
	COPYING.txt