package json including main file
Merge branch 'master' of https://github.com/simonfan/generator-package

Conflicts:
	app/templates/_package.both.json