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

Conflicts:
	Resources/BaseAutoUpdateController.js
	Resources/BaseViewController.js
	Resources/BaseWindowController.js
	Resources/alloy.js
	Resources/alloy/animation.js
	Resources/alloy/controllers/friend/friendAll.js
	Resources/alloy/controllers/friend/friendCategoryForm.js
	Resources/alloy/controllers/friend/friendCategoryRow.js
	Resources/alloy/controllers/home/home.js
	Resources/alloy/controllers/money/moneyExpenseCategoryForm.js
	Resources/alloy/controllers/money/moneyExpenseCategoryRow.js
	Resources/alloy/controllers/money/moneyIncomeCategoryForm.js
	Resources/alloy/controllers/money/moneyIncomeCategoryRow.js
	Resources/alloy/controllers/project/projectForm.js
	Resources/alloy/controllers/project/projectRow.js
	Resources/alloy/controllers/user/login.js
	Resources/alloy/controllers/user/registerForm.js
	Resources/alloy/controllers/user/userRow.js
	Resources/alloy/models/FriendCategory.js
	Resources/alloy/models/User.js
	Resources/alloy/sync/sql.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.AutoBindLabel/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.AutoUpdatableTextField/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.ContextMenu/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.DateTimePicker/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.NumericKeyboard/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.ScrollableViewTabBar/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.TitleBar/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.XTableView/controllers/widget.js
	Resources/alloy/widgets/nl.fokkezb.pullToRefresh/controllers/widget.js
	Resources/utils.js
	plugins/ti.alloy/plugin.pyc
11
Merge branch 'master' of https://github.com/hoyoji/HoYoJi
11
11
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	Resources/BaseAutoUpdateController.js
	Resources/BaseRowController.js
	Resources/BaseUIController.js
	Resources/BaseViewController.js
	Resources/BaseWindowController.js
	Resources/XModel.js
	Resources/alloy.js
	Resources/alloy/animation.js
	Resources/alloy/controllers/friend/friendAll.js
	Resources/alloy/controllers/friend/friendCategoryAll.js
	Resources/alloy/controllers/friend/friendCategoryForm.js
	Resources/alloy/controllers/friend/friendCategoryRow.js
	Resources/alloy/controllers/home/home.js
	Resources/alloy/controllers/message/messageAll.js
	Resources/alloy/controllers/money/moneyAddNew.js
	Resources/alloy/controllers/money/moneyExpenseCategoryAll.js
	Resources/alloy/controllers/money/moneyExpenseCategoryForm.js
	Resources/alloy/controllers/money/moneyIncomeCategoryForm.js
	Resources/alloy/controllers/money/moneyIncomeCategoryRow.js
	Resources/alloy/controllers/project/projectAll.js
	Resources/alloy/controllers/project/projectForm.js
	Resources/alloy/controllers/project/projectRow.js
	Resources/alloy/controllers/user/login.js
	Resources/alloy/controllers/user/registerForm.js
	Resources/alloy/controllers/user/userRow.js
	Resources/alloy/models/FriendCategory.js
	Resources/alloy/sync/sql.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.AutoBindLabel/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.AutoUpdatableTextField/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.ContextMenu/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.DateTimePicker/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.ScrollableViewTabBar/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.TitleBar/controllers/widget.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.XTableView/controllers/widget.js
	Resources/alloy/widgets/nl.fokkezb.pullToRefresh/controllers/widget.js
	Resources/utils.js
	plugins/ti.alloy/plugin.pyc
d
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	Resources/alloy/models/Project.js
	Resources/alloy/models/User.js
	Resources/alloy/sync/localStorage.js
	Resources/alloy/sync/util.js
	Resources/alloy/widgets/com.hoyoji.titanium.widget.NumericKeyboard/controllers/widget.js
	plugins/ti.alloy/plugin.pyc
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