Adding upload/task activity
Merge branch 'master' of https://github.com/Piusn/crm