type checking
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/Accounting/Account.js