Message page - Menu Page
Merge branch 'development'
Message page error
added message box
conflict removed
conflict