added: role, credit, discount, user
Merge remote-tracking branch 'origin/krestik_branch'

Conflicts:
	ComputerShop/ComputerShop/Credit.cs