new
Merge remote-tracking branch 'origin/novel1'

Conflicts:
	ios/view/SUPTableViewController.m