SAD
Merge remote-tracking branch 'origin/master'

Conflicts:
	laravel/app/models/StockValue.php
SAD