modified message 'error.gsp'
Merge remote-tracking branch 'origin/master'