Adapt flash style to bootstrap
Merge branch 'development' into next
Merge branch 'next'