changes with add to template
Merge branch 'master' of https://github.com/antirek/astconf-template

Conflicts:
	examples/app.js
	templates/extensions.json