improve instructions
Merge branch 'master' into dev

Conflicts:
	content/modules/dev/files.js