Refactor client
Merge branch 'new_master' of github.com:cleandart/clean_my_admin into new_master