organization user model commented
Merge branch 'feature/cartodb-mu' of github.com:CartoDB/cartodb into feature/cartodb-mu