Added support for multiple schools
Merge devel