s
fetch
joinTest fase1 end, refactor routes and some error
fix maker_data_spec
Merge remote-tracking branch 'origin/develop' into develop
drops
Merge branch 'hara' into develop