dasdas
Merge remote-tracking branch 'origin/master'

Conflicts:
	admin/reports/stock.php
	admin/reports/stock_value.php