Fixed conflicts
Fixed data conflicts
Fixed data conflicts
Form changed
Rebase
fixed detroy sale ajax

Conflicts:
	app/views/sales/_sales.html.haml