Merged changes from IWmoodle repo
Merge branch 'intranet13' of github.com:projectestac/agora into intranet13