CR fixes
CR Fixes
Integrate code climate
Merge branch staff-login into mail