Can't bring it to the previous state. Shit happens
Merge branch 'master' of https://github.com/ksugiarto/lancar_abadi

Conflicts:
	app/models/product.rb