Feature/13 flash messages

@mturalenka please merge