insert _dist and npproject and ignore
insert www and ignore
Merge branch 'master' into develop

Conflicts:
	.gitignore