its working
Merge remote-tracking branch 'origin/master'

Conflicts:
	cloud/views/clear_balance.ejs