sync before merge
Merge branch 'master'

Conflicts:
	api/dataAssemblers/spendingDetails.js
Merge branch 'haosun'