fixed #644
rolled back #547 until the flash messages will be placed over the page instead of inside the page
Merge remote-tracking branch 'origin/development' into development