added join_table added column_thumb_to_photo
Merge remote branch 'origin/master'