Manitou import
Merge pull request #1386 from affektive/manitou_user_upload

Manitou import