looks and feel vendor edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	MVC_DATABASE/Controllers/AccountController.cs