fixed incorrect merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	EasyBank/Controllers/ProtectedController.cs