bumped versions in archetypes
added missing artifact
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	ninja-core/src/site/markdown/developer/changelog.md
updated templates
Merge pull request #251 from svenkubiak/develop

Bumped version in archetypes