hotfix
Merge commit 'eabd31777cef49031fba4c01d2e93bda411b0fbf' into 3rdbranch

Conflicts:
	CA360.xcodeproj/project.xcworkspace/xcuserdata/saad.xcuserdatad/UserInterfaceState.xcuserstate