Removed potentially conflictive blocks
Merge branch 'intranet13' of github.com:projectestac/agora into intranet13