Adding Terms of User (template, url and vie)  and some links, also fixing some {% url %}
Fixing conflicts
Fixing missing conflict