Added messages to the view
validations
merge branch