messageBox,message,friend(model)
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	.fastdev.lock
	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/app.js
	app/models/User.js
	plugins/ti.alloy/plugin.pyc