ALl
Merge branch 'master' of https://github.com/eduardomusoru/smartpm
Fixing conflicts on home merge