node
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.gitignore