partial commit : school admin authentication
zone admin authentication
master->admin-auth, resolved conflicts
added template files
blind commit