Merge new redesigned Forms

Add to master branch new redesigned Forms(Form1, Form2, Form4, Form5)
Conflict fix

1
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProductShop/ProductShop.v12.suo