Changes
Ignore File Changes
Merge branch 'master' of https://github.com/nashraf-innostark/MAS

Conflicts:
	MAS/MAS.suo
	MAS/MAS/MAS.WebUI.csproj