Merge Request #1 from Keyur

with Admin Panel