method
Merge remote-tracking branch 'origin/master' into in-home

Conflicts:
	.gitignore
	client/writer/config.js
	client/writer/style/main.css
	package.json