Merge branch 'basic_user_workflow' of github.com:ciudadanointeligente/write-it into dev
Fixing migration
Resolving conflicts about migration
Merge branch 'basic_user_workflow' into dev
Merge branch 'dev' of github.com:ciudadanointeligente/write-it into dev
Merge pull request #32 from ciudadanointeligente/dev

[hotfix] migration fixing
Merge branch 'master' into production
Merge branch 'production' of github.com:ciudadanointeligente/write-it into production