32 bit
Merge branch 'master' of https://github.com/gmittal/minasan

Conflicts:
	ios/Firechat.xcodeproj/project.pbxproj

ios/Firechat.xcodeproj/project.xcworkspace/xcuserdata/kevin.xcuserdatad/
UserInterfaceState.xcuserstate