att map button added
testing
KM to chinese
AWD finished
Merge branch 'master' of github.com:668Jerry/1129ios
Merge branch 'novel1'

Conflicts:
	ios/view/SUPTableViewController.m