changed user_id to string from join tables
Merge branch 'develop'