Sync new code from gaurang
Merge branch 'master' of https://github.com/gaurang9007/Glutto

Conflicts:

Glutto.xcodeproj/project.xcworkspace/xcuserdata/maggigupta.xcuserdatad/U
serInterfaceState.xcuserstate