add label in xbutton
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/widgets/com.hoyoji.titanium.widget.XButton/controllers/widget.js
	app/widgets/com.hoyoji.titanium.widget.XButton/views/widget.xml
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/widgets/com.hoyoji.titanium.widget.XButton/controllers/widget.js
5.6
Merge branch 'master' of https://github.com/hoyoji/HoYoJi