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

Conflicts:
	plugins/ti.alloy/plugin.pyc
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	plugins/ti.alloy/plugin.pyc
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	Resources/BaseRowController.js
	Resources/BaseWindowController.js
	Resources/XModel.js
	Resources/alloy.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.XTableView/controllers/widget.js
	plugins/ti.alloy/plugin.pyc
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
z
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
Merge branch 'master' of https://github.com/hoyoji/HoYoJi