fixing theme adminlte
Merge origin/master

Conflicts:
	biz/theme-adminlte/modules/inventory/views/receive/index.php