changes for empty check

changes for empty check
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/Stock.php