fixed permission model
Merge branch 'CDB-2891' of github.com:CartoDB/cartodb into CDB-2891