merged www/ from dev
minor changes to the spec template
resolved conflicts when merging from master
Merge branch 'master' into dev

Conflicts:
	www/documentation/generated.html
	www/documentation/index.html
	www/documentation/rng-to-documentation.xsl
regenerated the documentation of the grammar