fix #4
fix #5
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	Resources/BaseAutoUpdateController.js
	Resources/BaseFormController.js
	Resources/BaseRowController.js
	Resources/BaseSaveController.js
	Resources/BaseUIController.js
	Resources/BaseViewController.js
	Resources/BaseWindowController.js
	Resources/XCollection.js
	Resources/XModel.js
	Resources/alloy.js
	Resources/alloy/CFG.js
	Resources/alloy/backbone.js
	Resources/alloy/controllers/BaseController.js
	Resources/alloy/controllers/actionMask.js
	Resources/alloy/controllers/friend/friendAll.js
	Resources/alloy/controllers/friend/friendCategoryAll.js
	Resources/alloy/controllers/friend/friendCategoryForm.js
	Resources/alloy/controllers/index.js
	Resources/alloy/controllers/mainWindow.js
	Resources/alloy/controllers/window.js
	Resources/alloy/models/FriendCategory.js
	Resources/alloy/models/MoneyExpenseCategory.js
	Resources/alloy/models/MoneyIncomeCategory.js
	Resources/alloy/sync/properties.js
	Resources/alloy/sync/sql.js
	Resources/alloy/underscore.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