Merge develop with master

Mailbox ui change 
PHpCS fixed