Fixed folder names
Merge branch 'master' of https://github.com/nsaditya/SimplySocial

Conflicts:

SimplySocial.xcodeproj/project.xcworkspace/xcshareddata/SimplySocial.xcc
heckout