BK-1204 Buttons overlapping on List of people screen
Merge branch '2.0' of github.com:sourcefabric/Booktype into 2.0