General Updates
Merge branch 'master' of https://github.com/phalecs/Eduportal.git