Feature/empty additional school issue 72

Updated the empty additional school branch with the latest develop, and fixed a couple of bad merge issues.