Correcting message of buttons
Merge branch 'development' into integration