up time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/admin/Report/balance.blade.php