04 agosto
Merge branch 'master' of https://github.com/leandroteruya/Sino_v2.1

Conflicts:

ScrollBlog.xcodeproj/project.xcworkspace/xcuserdata/alain.xcuserdatad/Us
erInterfaceState.xcuserstate