Merge branches 'develop' and 'master'
complete v1
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
modify template
fig duplicate file
Merge branch 'develop'
new feature execute one condition and modify log
fix removing file condition
Merge branch 'newissue' into develop
Merge branch 'develop'
fix delete condition when year difference
fix log print sepparate execution type and fix 6400 chart label
Merge branch 'newissue' into develop