added flash notice
Merge branch 'development'