numerous changes and fixes to users, cms and logs app along with common
Merge branch 'master' of https://github.com/OceanDev/admin-client
Rails 4.1.8.