test
ms not shadow
conflict appear, use master
reset all offset and finished navigationcontroller
blogviewcontroller, supviewcontroller, and attviewcontroller are added
sup map works
blog with navigation
blog finished
Merge branch 'novel1'

Conflicts:
	ios/view/SUPTableViewController.m
debug
new
Merge remote-tracking branch 'origin/novel1'

Conflicts:
	ios/view/SUPTableViewController.m
Merge branch 'master' of https://github.com/668Jerry/1129ios into watersu