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

Conflicts:

	app/lib/BaseAutoUpdateController.js