-Created template
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/node--stukowin.tpl.php