Updated ManageBooks and ManagePupils screen
Merge remote-tracking branch 'henning/developNew' into developNew