add msg for button on develop branch
merge master branch with develop branch
update the newdev branch