add flash message
Merge branch 'dev'

Conflicts:
	view/layout/my_layout.html