360 fix
fix some random bugs in stock info
Merge branch 'contacts-integration' of 192.168.0.3:tan-chong/sa into contacts-integration