Merge 3-09
Merge branch 'master' of https://github.com/leandroteruya/Sino_v2.1

Conflicts:
	ScrollBlog/FullStoryViewController.m
	ScrollBlog/ViewController.m
	ScrollBlog/iPhoneLoginController.h
	ScrollBlog/iPhoneLoginController.m
	ScrollBlog/iPhoneLoginController.xib