usertype and upload logs
Merge branch 'createUserDirectory' into user-type-and-upload-log
add upload_status and video_location fields to upload_logs
Merge branch 'master' into user-type-and-upload-log
add belongs to
Merge pull request #2 from mtcld/user-type-and-upload-log

User type and upload log
merge and resolve conflict