[fixed]: header height of 補給據點
[added]: display different image for each type for vshop
Merge branch 'master' of https://github.com/668Jerry/1129ios into watersu
Merge branch 'master' of github.com:668Jerry/1129ios
Merge branch 'novel1'

Conflicts:
	ios/view/SUPTableViewController.m
Merge branch 'novel1'
for screen saving