Merge branch 'master' of https://github.com/Stryker/NV-AIS-Competetive

Conflicts:
	.DS_Store
	NV AIS Competitive.xcodeproj/project.xcworkspace/xcuserdata/Sandeep.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/Stryker/NV-AIS-Competetive

Conflicts:
	.DS_Store