Fix line break on build section
Merge branch 'master' into models

Conflicts:
	package.json