Integrate change to master in order to delete dev

Now our dev branch must be master branch