Merge branch 'master' of https://github.com/ivan-brugere/csinder

Conflicts:

CSinder/CSinder.xcodeproj/project.xcworkspace/xcshareddata/CSinder.xcche
ckout

CSinder/CSinder.xcodeproj/project.xcworkspace/xcuserdata/ivan.xcuserdata
d/UserInterfaceState.xcuserstate
resolved conflict