more templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	n3js.xml
more templates