Update urls

Changed some url's to use a more Djangoic way with template tag url
Fixed security issue in template delete
Merge branch 'master' of https://github.com/djorda9/Simulated-Conversations