added conditions in base controllers
Merge branch 'master' of https://github.com/alelifaithCabahug/gradAdvising