c
c
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/lib/BaseUIController.js
	app/views/home/home.xml
	app/widgets/com.hoyoji.titanium.widget.ScrollableViewTabBar/controllers/widget.js
	app/widgets/com.hoyoji.titanium.widget.XButton/controllers/widget.js
	app/widgets/com.hoyoji.titanium.widget.XButton/views/widget.xml
c