Fixed #266 -- Use URL resolving in templates
Merge pull request #270 from olasitarska/266-url-resolving

Fixed #266 -- Use URL resolving in templates