add NumericKeyboard and DateTimePicker
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	Resources/alloy/controllers/friend/friendAll.js
	Resources/alloy/controllers/home/home.js
	Resources/alloy/controllers/message/messageAll.js
	Resources/alloy/controllers/money/moneyAddNew.js
	Resources/alloy/controllers/money/moneyExpenseCategoryForm.js
	Resources/alloy/controllers/money/moneyExpenseCategoryRow.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
	plugins/ti.alloy/plugin.pyc