added get_absolute_url function to use instead of complete url in templates
Adjusted merging issues