Merge branch 'merge_branch'
area buttons make automatically
Merge branch 'auto_make_area_button'