change model and map
add fixture
Merge branch 'master' into 1_change_model_and_map
Merge branch '1_change_model_and_map'