edit to REAL
Merge branch 'master' of https://github.com/hoyoji/HoYoJi

Conflicts:
	app/controllers/setting/currency/currencyAll.js
	app/models/MoneyAccount.js
Merge branch 'master' of https://github.com/hoyoji/HoYoJi