Se agrega una nueva vista a Control
Merge remote-tracking branch 'origin/master'

Conflicts:
	controller/main.js
	factory/price.js