Adding Files for business and customer control panel
Confict in code for send email
Resilving conflicts
Resolving conflicts
Fix for UsersController conflict