added flash error messages
Merge branch 'development'