fixed creating an user from org admin CDB-3248
fixed user deletion form organization admin CDB-2891
Merge branch 'CDB-2891' of github.com:CartoDB/cartodb into CDB-2891