Merge branch 'layout' of https://github.com/vyrp/cerberus into layout
Merge branch 'layout' of https://github.com/vyrp/cerberus into layout
Merge branch 'layout' of https://github.com/vyrp/cerberus into layout
Merge branch 'merge_layout' of https://github.com/vyrp/cerberus into merge_layout
two bugs exterminated