Merge branch 'task3' into d_beta
Merge branch 'task4' into d_beta
Merge branch 'task3' into d_stg
Merge branch 'task4' into d_stg
Merge branch 'master' into d_beta
Merge branch 'master' into d_stg
Merge branch 'd_stg'