revert url call into templates
Merge branch 'master' of git://github.com/oat-sa/tao-core