Merge and Add Login.aspx

merge change of Inventory report
Add login.aspx
update Inventory report sql statement by adding filter using MerchantID
updated MWServer