Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app.js
	node_modules/ventanilla-arduino/index.js