Merge branch 'dev_wy' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev_wy

# Conflicts:
#	pages/main/addtionalreduce/home.js
#	pages/main/addtionalreduce/home.wxml
#	pages/main/guide/guide.js
#	pages/main/taxperson/home.js

@@ -49,4 +49,4 @@
   </view>
 
 
-</view>
+</view>
\ No newline at end of file