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

Conflicts:
	Resources/alloy/controllers/user/login.js
	Resources/alloy/controllers/user/registerForm.js
	Resources/alloy/controllers/user/userRow.js
	Resources/alloy/models/User.js
	Resources/app.js
	app/models/User.js
message
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/alloy.js
	app/models/User.js