Committing Company master module of admin
Merged changes update to PM-8