Add zip
Resolve conflict
Merge branch 'master' of ssh://github.com/palaloi/ist-ploy
Add user type