Unit tests working again (Yay)
Merge branch 'parser' into ux

Conflicts:
	app/models/concerns/payments/calculations.rb
	test/fabricators/product_fabricator.rb
	test/models/product_test.rb
Views working... more or less...
Improved tasks