fx
Merge branch 'master' of https://github.com/yijixiuxin/xavierbtc

Conflicts:
	controller/test.php
	init.php