Use django url tag instead of hard coded urls
Merge branch 'reverse-url-lookup' into develop