Merge all files from dev branch to master