MergeErrors2
adf
Merge branch 'master' of https://github.com/DivingMaster/TestSA

Conflicts:
	TestSA/Views/Company/Customization.cshtml